q3map2: fix dangling pointer dereference

[xonotic/netradiant.git] / config.py

diff --git a/config.py b/config.py
index fa042a7e282f329281150f328ab689ff31c80d3e..f55b7bfa14860159c05ea6df74b155fc37d30b5b 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' )
@@ -247,8 +247,9 @@ class Config:
                        env.Append( CXXFLAGS = [ '-g' ] )
                        env.Append( CPPDEFINES = [ '_DEBUG' ] )
                else:
-                       env.Append( CFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
-                       env.Append( CXXFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
+                        # '-O' causes q3map2 errors on Ubuntu 10.10 32 bit.
+                       env.Append( CFLAGS = [ ] )
+                       env.Append( CXXFLAGS = [ ] )
 
        def CheckoutOrUpdate( self, svnurl, path ):
                if ( os.path.exists( path ) ):
@@ -262,7 +263,7 @@ class Config:
        def FetchGamePaks( self, path ):
                for pak in self.setup_packs:
                        if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' or pak == 'ReactionPack' ):
-                               svnurl = 'https://zerowing.idsoftware.com/svn/radiant.gamepacks/%s/trunk' % pak
+                               svnurl = 'svn://svn.icculus.org/gtkradiant-gamepacks/%s/trunk' % pak
                                self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) )
 
        def Setup( self ):
@@ -284,7 +285,7 @@ class Config:
                                'STLport-5.2.1-4.zip'
                                ]:
                                if ( not os.path.exists( lib_archive ) ):
-                                       cmd = [ 'wget', '-N', 'http://porky.nerius.com/radiant-libs-win32/%s' % lib_archive ]
+                                       cmd = [ 'wget', '-N', 'http://icculus.org/gtkradiant/files/1.6.2/%s' % lib_archive ]
                                        print( repr( cmd ) )
                                        subprocess.check_call( cmd )
                                        lib_archive_path = os.path.abspath( lib_archive )