ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2025-01-24 02:11:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix Linux x86_64 compile (Debian Sid, gcc 4.4.5)

Browse source 
git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@480 8a3a26a2-13c4-0310-b231-cf6edde360e5
This commit is contained in:
TTimo 2011-03-05 20:06:42 +00:00
parent 8d530e8707
commit b0978b99ca
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
SConscript.q3map2
View file

@ -10,7 +10,7 @@ Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment()
settings.SetupEnvironment( env, config['name'] )
env.Prepend( CPPPATH = [ '#tools/quake3/common' ] )
env.Append( LIBS = [ 'pthread', 'png', 'jpeg' ] )
env.Append( LIBS = [ 'm', 'pthread', 'png', 'jpeg' ] )
proj = utils.vcproj( os.path.join( GetLaunchDir(), 'tools/quake3/q3map2/q3map2.vcproj' ) )
objects = lib_objects
objects += [ os.path.join( 'tools/quake3/q3map2', i ) for i in proj.getSourceFiles() ]

1
SConscript.radiant
View file

@ -9,6 +9,7 @@ Import( [ 'utils', 'config', 'settings', 'lib_objects' ] )
env = Environment()
settings.SetupEnvironment( env, config[ 'name' ], useGtk = True, useGtkGL = True )
env.Append( LIBS = [ 'dl' ] )
proj = utils.vcproj( os.path.join( GetLaunchDir(), 'radiant/radiant.vcproj' ) )
radiant = env.Program( 'radiant.bin', lib_objects + [ os.path.join( 'radiant', i ) for i in proj.getSourceFiles() ] )

6
config.py
View file

@ -76,7 +76,7 @@ class Config:
config['shared'] = False
Export( 'utils', 'settings', 'config' )
build_dir = os.path.join( 'build', config_name, 'radiant' )
BuildDir( build_dir, '.', duplicate = 0 )
VariantDir( build_dir, '.', duplicate = 0 )
lib_objects = []
for project in [ 'libs/synapse/synapse.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj' ]:
Export( 'project' )
@ -93,7 +93,7 @@ class Config:
config['shared'] = True
Export( 'project', 'config' )
build_dir = os.path.join( 'build', config_name, 'shobjs' )
BuildDir( build_dir, '.', duplicate = 0 )
VariantDir( build_dir, '.', duplicate = 0 )
shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
for project in [ 'plugins/vfspk3/vfspk3.vcproj',
@ -158,7 +158,7 @@ class Config:
config['shared'] = False
Export( 'utils', 'settings', 'config' )
build_dir = os.path.join( 'build', config_name, 'q3map2' )
BuildDir( build_dir, '.', duplicate = 0 )
VariantDir( build_dir, '.', duplicate = 0 )
lib_objects = []
for project in [ 'tools/quake3/common/quake3-common.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/md5lib/md5lib.vcproj' ]:
Export( 'project' )