ShuriZma
/
fceux
mirror of https://github.com/TASEmulators/fceux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed the mysterious input issue that was caused by not having liblua installed.

This commit is contained in:
punkrockguy318 2009-04-14 17:54:38 +00:00
parent b4f4f62553
commit 06e22c91a8
3 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@ -8,7 +8,6 @@ opts.AddOptions(
BoolOption('OPENGL', 'Enable OpenGL support', 1), BoolOption('OPENGL', 'Enable OpenGL support', 1),
BoolOption('LSB_FIRST', 'Least signficant byte first (non-PPC)', 1), BoolOption('LSB_FIRST', 'Least signficant byte first (non-PPC)', 1),
BoolOption('DEBUG', 'Build with debugging symbols', 0), BoolOption('DEBUG', 'Build with debugging symbols', 0),
BoolOption('LUA', 'Enable Lua support', 1),
BoolOption('NEWPPU', 'Enable new PPU core', 0), BoolOption('NEWPPU', 'Enable new PPU core', 0),
BoolOption('CREATE_AVI', 'Enable avi creation support (SDL only)', 0), BoolOption('CREATE_AVI', 'Enable avi creation support (SDL only)', 0),
BoolOption('LOGO', 'Enable a logoscreen when creating avis (SDL only)', '1') BoolOption('LOGO', 'Enable a logoscreen when creating avis (SDL only)', '1')
@ -57,12 +56,12 @@ else:
if not conf.CheckLib('z', autoadd=1): if not conf.CheckLib('z', autoadd=1):
print 'Did not find libz or z.lib, exiting!' print 'Did not find libz or z.lib, exiting!'
Exit(1) Exit(1)
if env['LUA']:
lua51 = conf.CheckLib('lua5.1', autoadd=1) lua51 = conf.CheckLib('lua5.1', autoadd=1)
lua = conf.CheckLib('lua', autoadd=1) lua = conf.CheckLib('lua', autoadd=1)
if lua == 0 and lua51 == 0: if lua == 0 and lua51 == 0:
print 'Did not find liblua5.1, liblua, lua.lib or lua5.1.lib, compiling anyway!' print 'Did not find liblua5.1, liblua, lua.lib or lua5.1.lib, exiting!'
env['LUA'] = 0 Exit(1)
### Search for zenity if we're not in windows ### Search for zenity if we're not in windows
if env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin': if env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin':
@ -103,7 +102,6 @@ else:
conf.env.Append(CPPDEFINES = ['PSS_STYLE=1']) conf.env.Append(CPPDEFINES = ['PSS_STYLE=1'])
# parse SDL cflags/libs # parse SDL cflags/libs
env.ParseConfig('sdl-config --cflags --libs') env.ParseConfig('sdl-config --cflags --libs')
if env['LUA']:
# parse liblua cflags # parse liblua cflags
if lua51: if lua51:
env.Append(CPPPATH = ['/usr/local/include/lua5.1', '/usr/include/lua5.1']) env.Append(CPPPATH = ['/usr/local/include/lua5.1', '/usr/include/lua5.1'])

1
changelog.txt
View File

@ -1,3 +1,4 @@
14-apr-2009 - punkrockguy - sdl - LUA is NO longer optional, so the SConscripts have been updated to reflect that change. This fixes the mysterious non-working input issue.
12-apr-2009 - shinydoofy - sdl - implemented saving/loading a savestate from a specific file on Alt+S/L 12-apr-2009 - shinydoofy - sdl - implemented saving/loading a savestate from a specific file on Alt+S/L
11-apr-2009 - shinydoofy - sdl - implemented starting an FM2 movie on Alt+R 11-apr-2009 - shinydoofy - sdl - implemented starting an FM2 movie on Alt+R
11-apr-2009 - adelikat - made default save slot 0 instead of 1, Win32 - remember last slot used 11-apr-2009 - adelikat - made default save slot 0 instead of 1, Win32 - remember last slot used

4
src/SConscript
View File

@ -12,6 +12,7 @@ file.cpp
filter.cpp filter.cpp
ines.cpp ines.cpp
input.cpp input.cpp
lua-engine.cpp
netplay.cpp netplay.cpp
nsf.cpp nsf.cpp
oldmovie.cpp oldmovie.cpp
@ -40,9 +41,6 @@ mappers
Import('env') Import('env')
Export('env') Export('env')
if env['LUA']:
file_list.append('lua-engine.cpp')
if env['CREATE_AVI']: if env['CREATE_AVI']:
subdirs.append('drivers/videolog') subdirs.append('drivers/videolog')