X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=config.py;h=4c441393ff8fbff47d5832feca409414fff0f398;hb=6ac1b9cfd3b3207a494720dbe4ba2c531e499d97;hp=fde0a3c171975034919713bacf9a8c0c7655b101;hpb=c6b22295b670f9c50b939a7c66473d656af5a776;p=xonotic%2Fnetradiant.git diff --git a/config.py b/config.py index fde0a3c1..4c441393 100644 --- a/config.py +++ b/config.py @@ -247,9 +247,8 @@ class Config: env.Append( CXXFLAGS = [ '-g' ] ) env.Append( CPPDEFINES = [ '_DEBUG' ] ) else: - # '-O' causes q3map2 errors on Ubuntu 10.10 32 bit. - env.Append( CFLAGS = [ ] ) - env.Append( CXXFLAGS = [ ] ) + env.Append( CFLAGS = [ '-O2', '-fno-strict-aliasing' ] ) + env.Append( CXXFLAGS = [ '-O2', '-fno-strict-aliasing' ] ) def CheckoutOrUpdate( self, svnurl, path ): if ( os.path.exists( path ) ): @@ -263,7 +262,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 ): @@ -285,7 +284,7 @@ class Config: 'STLport-5.2.1-4.zip' ]: if ( not os.path.exists( lib_archive ) ): - cmd = [ 'wget', '-N', 'http://zerowing.idsoftware.com/files/radiant/developer/1.6.2/%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 )