* divVerent's patch for the brush primitives surface dialog (fixed segfault due to...

[xonotic/netradiant.git] / config.py

diff --git a/config.py b/config.py
index aca2d7a9deb65821950adbf39e157456efe9404b..48b54c9481cc6073d4698d708cfab4a89ae74ce4 100644 (file)
--- a/config.py
+++ b/config.py
@@ -29,11 +29,11 @@ class Config:
                self.cc = 'gcc'
                self.cxx = 'g++'
                self.install_directory = 'install'
-               
+
                # platforms for which to assemble a setup
                self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ]
                # paks to assemble in the setup
-               self.setup_packs = [ 'Q3Pack', 'UrTPack' ]
+               self.setup_packs = [ 'Q3Pack', 'UrTPack', 'UFOAIPack', 'Q2WPack' ]
 
        def __repr__( self ):
                return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
@@ -236,7 +236,7 @@ class Config:
                if ( useZ ):
                        env.Append( LIBS = 'z' )
 
-               env.Append( CFLAGS = baseflags )
+               env.Append( CCFLAGS = baseflags )
                env.Append( CXXFLAGS = baseflags + [ '-fpermissive', '-fvisibility-inlines-hidden' ] )
                env.Append( CPPPATH = [ 'include', 'libs' ] )
                env.Append( CPPDEFINES = [ 'Q_NO_STLPORT' ] )
@@ -258,11 +258,11 @@ class Config:
                ret = os.system( cmd )
                if ( ret != 0 ):
                        raise 'checkout or update failed'
-                       
+
 
        def FetchGamePaks( self, path ):
                for pak in self.setup_packs:
-                       if ( pak == 'Q3Pack' or pak == 'UrTPack' ):
+                       if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' ):
                                svnurl = 'https://zerowing.idsoftware.com/svn/radiant.gamepacks/%s/trunk' % pak
                                self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) )