Changeset 202

Timestamp:

03/04/08 11:01:45 (4 months ago)

Author:

mattn

Message:

* activate surface_ufoai and model plugins for compilation
* added useGtk = true for surface_ufoai and model plugins
* added picomodel to shared libs list (needed by the model plugin)

Files:

• GtkRadiant/branches/ZeroRadiant/SConscript.module (modified) (2 diffs)
• GtkRadiant/branches/ZeroRadiant/config.py (modified) (14 diffs)

GtkRadiant/branches/ZeroRadiant/SConscript.module

@@ -18 +18 @@
-if ( libname == 'surface' ):
-        useGtk = True
+if ( libname == 'surface_ufoai' ):
+        useGtk = True
-if ( libname == 'surface_quake2' ):
-        useGtk = True
@@ -33 +35 @@
-        useGtk = True
-if ( libname == 'spritemodel' ):
+        useGtk = True
+if ( libname == 'model' ):
-        useGtk = True
-if ( libname == 'TexTool' ):

GtkRadiant/branches/ZeroRadiant/config.py

@@ -9 +9 @@
-# aliases are going to be very needed here
-# we have dependency situations too
- 
+
-
-class Config:
@@ -20 +20 @@
-        # 'all' -> for each choices
-        # 'gamecode' for the targets, 'game' 'cgame' 'ui'
-
+
-        def __init__( self ):
-                # initialize defaults
@@ -91 +91 @@
-                        # PIC versions of the libs for the modules
-                        shlib_objects_extra = {}
-
+picomodel/picomodel.vcproj', 'libs/
-                                ( libpath, libname ) = os.path.split( project )
-                                libname = os.path.splitext( libname )[0]
@@ -106 +106 @@
-                                         'plugins/entity/entity.vcproj',
-                                         'plugins/image/image.vcproj',
-
+
+
-                                        # 'plugins/imagepng/imagepng.vcproj',
-                                         'plugins/imagewal/imagewal.vcproj',
@@ -116 +117 @@
-                                         'plugins/shaders/shaders.vcproj',
-                                         'plugins/surface/surface.vcproj',
+                                         'plugins/surface_ufoai/surface_ufoai.vcproj',
-                                         'plugins/surface_quake2/surface_quake2.vcproj',
-                                         'plugins/surface_heretic2/surface_heretic2.vcproj',
@@ -123 +125 @@
-                                        # FIXME What is this? Empty dir for me - remove me?
-                                        # 'contrib/patches/patches.vcproj',
-contrib
+plugins
-
-                                        # FIXME Doesn't compile cleanly
@@ -137 +139 @@
-                                if ( libname == 'entity' ):
-                                        shlib_objects += shlib_objects_extra['mathlib']
+                                elif ( libname == 'model' ):
+                                        shlib_objects += shlib_objects_extra['picomodel']
-#                               elif ( libname == 'spritemodel' ):
-#                                       shlib_objects += shlib_objects_extra['mathlib']
@@ -163 +167 @@
-                        q3map2 = SConscript( os.path.join( build_dir, 'SConscript.q3map2' ) )
-                        self.InstallAs( 'install/q3map2', q3map2 )
-
+
-
-        def emit( self ):
@@ -222 +226 @@
-                if ( useJPEG ):
-                        env.Append( LIBS = 'jpeg' )
-
+
-                env.Append( CFLAGS = baseflags )
-                env.Append( CXXFLAGS = baseflags + [ '-fpermissive', '-fvisibility-inlines-hidden' ] )
@@ -230 +234 @@
-                        env.Append( CFLAGS = [ '-g' ] )
-                        env.Append( CXXFLAGS = [ '-g' ] )
-                                
+
-                else:
-                        env.Append( CFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations', '-fno-strict-aliasing' ] )
@@ -239 +243 @@
-
-# parse the config statement line to produce/update an existing config list
- 
+
-class ConfigParser:
-        def __init__( self ):
@@ -283 +287 @@
-                        while ( len( value_split ) != 0 ):
-                                value_array.append( value_split.pop() )
-                                      
+
-                except:
-                        print traceback.print_exception( sys.exc_type, sys.exc_value, sys.exc_traceback )
@@ -289 +293 @@
-                        return
-
-           
-
+
+
-        def parseStatements( self, _configs, statements ):
-                self.current_config = None
@@ -307 +311 @@
-                                # NOTE: have that in self._processOp too
-                                self._setupParser( self.current_config )
-
+
-                        ret = self._parseStatement( s )
-                        if ( ret is None ):