ioquake
/
gtkradiant
mirror of https://github.com/TTimo/GtkRadiant.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #584 from illwieckz/sconsfix 

scons: do not look for vfsqlpk3, make diff easier
This commit is contained in:
Timothee "TTimo" Besset 2018-01-22 13:01:13 -06:00 committed by GitHub
parent e1eeefac58 7660023c96
commit 95ae5af82b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
config.py
View File

@ -31,7 +31,19 @@ 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 # paks to assemble in the setup
self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack', 'Q2Pack', 'QuetooPack', 'JAPack', 'STVEFPack', 'WolfPack', 'UnvanquishedPack', 'Q1Pack' ] self.setup_packs = [
'Q3Pack',
'UrTPack',
'ETPack',
'QLPack',
'Q2Pack',
'QuetooPack',
'JAPack',
'STVEFPack',
'WolfPack',
'UnvanquishedPack',
'Q1Pack',
]
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 )
@ -94,7 +106,7 @@ class Config:
VariantDir( build_dir, '.', duplicate = 0 ) VariantDir( build_dir, '.', duplicate = 0 )
shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) ) shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
for project in [ 'plugins/vfsqlpk3/vfsqlpk3.vcxproj', for project in [
'plugins/vfspk3/vfspk3.vcxproj', 'plugins/vfspk3/vfspk3.vcxproj',
'plugins/vfspak/vfspak.vcxproj', 'plugins/vfspak/vfspak.vcxproj',
'plugins/vfswad/vfswad.vcxproj', 'plugins/vfswad/vfswad.vcxproj',
@ -118,7 +130,7 @@ class Config:
'contrib/hydratoolz/hydratoolz.vcxproj', 'contrib/hydratoolz/hydratoolz.vcxproj',
'contrib/bobtoolz/bobtoolz.vcxproj', 'contrib/bobtoolz/bobtoolz.vcxproj',
'contrib/gtkgensurf/gtkgensurf.vcxproj', 'contrib/gtkgensurf/gtkgensurf.vcxproj',
'contrib/bkgrnd2d/bkgrnd2d.vcxproj' 'contrib/bkgrnd2d/bkgrnd2d.vcxproj',
]: ]:
( libpath, libname ) = os.path.split( project ) ( libpath, libname ) = os.path.split( project )
libname = os.path.splitext( libname )[0] libname = os.path.splitext( libname )[0]