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

sdl: use system lua patch (part 2; missed file in previous commit)

This commit is contained in:
punkrockguy318 2013-07-08 23:05:36 +00:00
parent 97295e18c4
commit ae7c5ffc78
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/SConstruct
View File

@ -44,7 +44,7 @@ if platform.system == "ppc":
env['LSB_FIRST'] = 0 env['LSB_FIRST'] = 0
# Default compiler flags: # Default compiler flags:
env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare', '-Isrc/lua/src']) env.Append(CCFLAGS = ['-Wall', '-Wno-write-strings', '-Wno-sign-compare'])
if os.environ.has_key('PLATFORM'): if os.environ.has_key('PLATFORM'):
env.Replace(PLATFORM = os.environ['PLATFORM']) env.Replace(PLATFORM = os.environ['PLATFORM'])
@ -140,9 +140,11 @@ else:
lua_available = False lua_available = False
if conf.CheckLib('lua5.1'): if conf.CheckLib('lua5.1'):
env.Append(LINKFLAGS = ["-ldl", "-llua5.1"]) env.Append(LINKFLAGS = ["-ldl", "-llua5.1"])
env.Append(CCFLAGS = ["-I/usr/include/lua5.1"])
lua_available = True lua_available = True
elif conf.CheckLib('lua'): elif conf.CheckLib('lua'):
env.Append(LINKFLAGS = ["-ldl", "-llua"]) env.Append(LINKFLAGS = ["-ldl", "-llua"])
env.Append(CCFLAGS = ["-I/usr/include/lua"])
lua_available = True lua_available = True
if lua_available == False: if lua_available == False:
print 'Could not find liblua, exiting!' print 'Could not find liblua, exiting!'