--- SConstruct (revision 1218) +++ SConstruct (working copy) @@ -205,9 +205,9 @@ # Configure Environments ################################################################ -env.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] ) -crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] ) -crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] ) +env.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] ) +crossmingwenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] ) +crosslinuxenv.Append( CPPPATH = [ '.', 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua', 'src/Lib/toluapp'] ) # for this platform if thisplatform == 'darwin': @@ -265,12 +265,12 @@ MakeStaticLib(crosslinuxnetworkenv, 'npnetwork', 'Network', '*.cpp') # BUILDS LUA -luaenv.Append( CPPPATH = [ 'src/Lib/lua', 'src/Lib/toluapp'] ) -crossmingwluaenv.Append( CPPPATH = [ 'src/Lib/lua', 'src/Lib/toluapp'] ) -crosslinuxluaenv.Append( CPPPATH = [ 'src/Lib/lua', 'src/Lib/toluapp'] ) -MakeStaticLib( luaenv, 'nplua', 'lua toluapp', '*.c') -MakeStaticLib(crossmingwluaenv, 'nplua', 'lua toluapp', '*.c') -MakeStaticLib(crosslinuxluaenv, 'nplua', 'lua toluapp', '*.c') +luaenv.Append( CPPPATH = [ 'src/Lib/lua' ] ) +crossmingwluaenv.Append( CPPPATH = [ 'src/Lib/lua' ] ) +crosslinuxluaenv.Append( CPPPATH = [ 'src/Lib/lua' ] ) +MakeStaticLib( luaenv, 'nplua', 'lua', '*.c') +MakeStaticLib(crossmingwluaenv, 'nplua', 'lua', '*.c') +MakeStaticLib(crosslinuxluaenv, 'nplua', 'lua', '*.c') # BUILDS PHYSFS physfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] ) @@ -288,13 +288,13 @@ # BUILDS 2D env.Append( CFLAGS = [ '-DZ_PREFIX=1' ] ) env.Append( CPPPATH = 'src/Lib/physfs/zlib123' ) -MakeStaticLib(env, 'np2d', '2D 2D/libpng', '*.c*') +MakeStaticLib(env, 'np2d', '2D', '*.c*') crossmingwenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] ) crossmingwenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' ) -MakeStaticLib(crossmingwenv, 'np2d', '2D 2D/libpng', '*.c*') +MakeStaticLib(crossmingwenv, 'np2d', '2D', '*.c*') crosslinuxenv.Append( CFLAGS = [ '-DZ_PREFIX=1' ] ) crosslinuxenv.Append( CPPPATH = 'src/Lib/physfs/zlib123' ) -MakeStaticLib(crosslinuxenv, 'np2d', '2D 2D/libpng', '*.c*') +MakeStaticLib(crosslinuxenv, 'np2d', '2D', '*.c*') # BUILDS REST OF LIBRARIES MakeStaticLib(env, 'nplibs', 'ArrayUtil INIParser Types Util optionmm','*.cpp')