diff --git a/SConscript.lib b/SConscript.lib index 41544a6..dd0988d 100644 --- a/SConscript.lib +++ b/SConscript.lib @@ -10,7 +10,7 @@ Import( [ 'utils', 'config', 'settings', 'project' ] ) ( libpath, libname ) = os.path.split( project ) libname = os.path.splitext( libname )[0] -env = Environment() +env = Environment( ENV = os.environ ) settings.SetupEnvironment( env, config['name'] ) proj = utils.vcproj( os.path.join( GetLaunchDir(), project ) ) diff --git a/SConscript.module b/SConscript.module index c37253f..9d4bdd6 100644 --- a/SConscript.module +++ b/SConscript.module @@ -10,7 +10,7 @@ Import( [ 'utils', 'config', 'settings', 'project', 'shlib_objects' ] ) ( libpath, libname ) = os.path.split( project ) libname = os.path.splitext( libname )[0] -env = Environment() +env = Environment( ENV = os.environ ) useJPEG = True useGtk = True diff --git a/SConscript.q3data b/SConscript.q3data index 9d68a40..c89012f 100644 --- a/SConscript.q3data +++ b/SConscript.q3data @@ -7,7 +7,7 @@ import os Import( [ 'utils', 'config', 'settings', 'lib_objects' ] ) -env = Environment() +env = Environment( ENV = os.environ ) settings.SetupEnvironment( env, config['name'] ) env.Prepend( CPPPATH = [ '#tools/quake3/common' ] ) env.Append( LIBS = [ 'm', 'pthread' ] ) diff --git a/SConscript.q3map2 b/SConscript.q3map2 index 28746e3..2c98113 100644 --- a/SConscript.q3map2 +++ b/SConscript.q3map2 @@ -7,7 +7,7 @@ import os Import( [ 'utils', 'config', 'settings', 'lib_objects' ] ) -env = Environment() +env = Environment( ENV = os.environ ) settings.SetupEnvironment( env, config['name'] ) env.Prepend( CPPPATH = [ '#tools/quake3/common' ] ) env.Append( LIBS = [ 'm', 'pthread', 'png', 'jpeg' ] ) diff --git a/SConscript.q3map2.urt b/SConscript.q3map2.urt index b297eb7..c75f73a 100644 --- a/SConscript.q3map2.urt +++ b/SConscript.q3map2.urt @@ -7,7 +7,7 @@ import os Import( [ 'utils', 'config', 'settings', 'lib_objects' ] ) -env = Environment() +env = Environment( ENV = os.environ ) settings.SetupEnvironment( env, config['name'] ) env.Prepend( CPPPATH = [ '#tools/quake3/common', ] ) env.Append( LIBS = [ 'm', 'pthread', 'png', 'jpeg' ] ) diff --git a/SConscript.radiant b/SConscript.radiant index 5602ad6..114689a 100644 --- a/SConscript.radiant +++ b/SConscript.radiant @@ -7,7 +7,7 @@ import os Import( [ 'utils', 'config', 'settings', 'lib_objects' ] ) -env = Environment() +env = Environment( ENV = os.environ ) settings.SetupEnvironment( env, config[ 'name' ], useGtk = True, useGtkGL = True ) env.Append( LIBS = [ 'dl' ] ) proj = utils.vcproj( os.path.join( GetLaunchDir(), 'radiant/radiant.vcproj' ) ) diff --git a/config.py b/config.py index dcf2122..c317df3 100644 --- a/config.py +++ b/config.py @@ -25,8 +25,8 @@ class Config: # platforms for which to assemble a setup self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ] - # paks to assemble in the setup (only the Enemy Territory one by default) - self.setup_packs = [ 'ETPack' ] # [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack' ] + # paks to assemble in the setup + self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack' ] def __repr__( self ): return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )