ubergames/gtkradiant
0
0
Fork 0
mirror of https://github.com/UberGames/GtkRadiant.git synced 2024-11-24 21:01:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

Set the default packs, pull the invocation environment into the scons Environment (for pkg-config)

Browse source
This commit is contained in:
Timothee Besset 2013-03-30 09:24:40 -05:00
parent b6e91568a8
commit 575c090380
7 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConscript.lib
View file

@ -10,7 +10,7 @@ Import( [ 'utils', 'config', 'settings', 'project' ] )
( libpath, libname ) = os.path.split( project ) ( libpath, libname ) = os.path.split( project )
libname = os.path.splitext( libname )[0] libname = os.path.splitext( libname )[0]
env = Environment() env = Environment( ENV = os.environ )
settings.SetupEnvironment( env, config['name'] ) settings.SetupEnvironment( env, config['name'] )
proj = utils.vcproj( os.path.join( GetLaunchDir(), project ) ) proj = utils.vcproj( os.path.join( GetLaunchDir(), project ) )

2
SConscript.module
View file

@ -10,7 +10,7 @@ Import( [ 'utils', 'config', 'settings', 'project', 'shlib_objects' ] )
( libpath, libname ) = os.path.split( project ) ( libpath, libname ) = os.path.split( project )
libname = os.path.splitext( libname )[0] libname = os.path.splitext( libname )[0]
env = Environment() env = Environment( ENV = os.environ )
useJPEG = True useJPEG = True
useGtk = True useGtk = True

2
SConscript.q3data
View file

@ -7,7 +7,7 @@ import os
Import( [ 'utils', 'config', 'settings', 'lib_objects' ] ) Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment() env = Environment( ENV = os.environ )
settings.SetupEnvironment( env, config['name'] ) settings.SetupEnvironment( env, config['name'] )
env.Prepend( CPPPATH = [ '#tools/quake3/common' ] ) env.Prepend( CPPPATH = [ '#tools/quake3/common' ] )
env.Append( LIBS = [ 'm', 'pthread' ] ) env.Append( LIBS = [ 'm', 'pthread' ] )

2
SConscript.q3map2
View file

@ -7,7 +7,7 @@ import os
Import( [ 'utils', 'config', 'settings', 'lib_objects' ] ) Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment() env = Environment( ENV = os.environ )
settings.SetupEnvironment( env, config['name'] ) settings.SetupEnvironment( env, config['name'] )
env.Prepend( CPPPATH = [ '#tools/quake3/common' ] ) env.Prepend( CPPPATH = [ '#tools/quake3/common' ] )
env.Append( LIBS = [ 'm', 'pthread', 'png', 'jpeg' ] ) env.Append( LIBS = [ 'm', 'pthread', 'png', 'jpeg' ] )

2
SConscript.q3map2.urt
View file

@ -7,7 +7,7 @@ import os
Import( [ 'utils', 'config', 'settings', 'lib_objects' ] ) Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment() env = Environment( ENV = os.environ )
settings.SetupEnvironment( env, config['name'] ) settings.SetupEnvironment( env, config['name'] )
env.Prepend( CPPPATH = [ '#tools/quake3/common', ] ) env.Prepend( CPPPATH = [ '#tools/quake3/common', ] )
env.Append( LIBS = [ 'm', 'pthread', 'png', 'jpeg' ] ) env.Append( LIBS = [ 'm', 'pthread', 'png', 'jpeg' ] )

2
SConscript.radiant
View file

@ -7,7 +7,7 @@ import os
Import( [ 'utils', 'config', 'settings', 'lib_objects' ] ) Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment() env = Environment( ENV = os.environ )
settings.SetupEnvironment( env, config[ 'name' ], useGtk = True, useGtkGL = True ) settings.SetupEnvironment( env, config[ 'name' ], useGtk = True, useGtkGL = True )
env.Append( LIBS = [ 'dl' ] ) env.Append( LIBS = [ 'dl' ] )
proj = utils.vcproj( os.path.join( GetLaunchDir(), 'radiant/radiant.vcproj' ) ) proj = utils.vcproj( os.path.join( GetLaunchDir(), 'radiant/radiant.vcproj' ) )

4
config.py
View file

@ -25,8 +25,8 @@ class Config:
# platforms for which to assemble a setup # platforms for which to assemble a setup
self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ] self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ]
# paks to assemble in the setup (only the Enemy Territory one by default) # paks to assemble in the setup
self.setup_packs = [ 'ETPack' ] # [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack' ] self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack' ]
def __repr__( self ): def __repr__( self ):
return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected ) return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )