fix Linux x86_64 compile (Debian Sid, gcc 4.4.5)

git-svn-id: svn://svn.icculus.org/gtkradiant/GtkRadiant/trunk@480 8a3a26a2-13c4-0310-b231-cf6edde360e5

diff --git a/SConscript.q3map2 b/SConscript.q3map2
index 30ba5cbeff11fd66598b8c860996a5f7f4d3d389..82f952b7c8541c6c793936017342454b3702b1a6 100644 (file)
--- a/SConscript.q3map2
+++ b/SConscript.q3map2
@@ -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() ]

diff --git a/SConscript.radiant b/SConscript.radiant
index f37b0bb7254c398a759d014204610a9507f0f23c..e2ae082ee147ae56f89c427b8c22b65aa1b33e5b 100644 (file)
--- a/SConscript.radiant
+++ b/SConscript.radiant
@@ -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() ] )

diff --git a/config.py b/config.py
index fa042a7e282f329281150f328ab689ff31c80d3e..3a51718167f7c4bcfc857005d9d671950b3ee756 100644 (file)
--- a/config.py
+++ b/config.py
@@ -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' )