From 870d408794dcd20d6aaa0d3337369fe9e5b7144e Mon Sep 17 00:00:00 2001 From: punkrockguy318 Date: Thu, 14 Aug 2008 14:50:27 +0000 Subject: [PATCH] Build script now looks in lib/lua5.1 and lib/lua --- SConstruct | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 695b508b..eccd8661 100644 --- a/SConstruct +++ b/SConstruct @@ -47,9 +47,12 @@ else: if not conf.CheckLib('z', autoadd=1): print 'Did not find libz or z.lib, exiting!' Exit(1) - if not conf.CheckLib('lua5.1', autoadd=1): - print 'Did not find liblua5.1 or lua5.1.lib, exiting!' + lua51 = conf.CheckLib('lua5.1', autoadd=1) + lua = conf.CheckLib('lua', autoadd=1) + if lua == 0 and lua51 == 0: + print 'Did not find liblua5.1, liblua, lua.lib or lua5.1.lib, exiting!' Exit(1) + ### Search for zenity if we're not in windows if env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin': path = os.getenv('PATH') @@ -83,7 +86,10 @@ else: # parse SDL cflags/libs env.ParseConfig('sdl-config --cflags --libs') # parse liblua cflags - env.Append(CPPPATH = ['/usr/local/include/lua5.1', '/usr/include/lua5.1']) + if lua51: + env.Append(CPPPATH = ['/usr/local/include/lua5.1', '/usr/include/lua5.1']) + if lua: + env.Append(CPPPATH = ['/usr/local/include/lua', '/usr/include/lua']) env = conf.Finish() if sys.byteorder == 'little' or env['PLATFORM'] == 'win32':