# config = debug release
# aliases are going to be very needed here
# we have dependency situations too
-# target =
+# target =
class Config:
# not used atm, but useful to keep a list in mind
# aliases
# 'all' -> for each choices
# 'gamecode' for the targets, 'game' 'cgame' 'ui'
-
+
def __init__( self ):
# initialize defaults
self.target_selected = [ 'radiant', 'q3map2' ]
self.config_selected = [ 'release' ]
# those are global to each config
self.platform = platform.system()
- if ( self.platform == 'Darwin' ):
- self.cc = 'gcc'
- self.cxx = 'g++'
- else:
- self.cc = 'gcc-4.1'
- self.cxx = 'g++-4.1'
- self.install = True
+ self.cc = 'gcc'
+ self.cxx = 'g++'
+ self.install_directory = 'install'
def __repr__( self ):
return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
def _processCXX( self, ops ):
self.cxx = ops
- def _processInstall( self, ops ):
- ops = ops[0]
- if ( ops == 'yes' or ops == 'true' or ops == 'True' or ops == '1' or ops == True ):
- self.install = True
- return
- self.install = False
+ def _processInstallDir( self, ops ):
+ self.install_directory = os.path.normpath( os.path.expanduser( ops[0] ) )
def setupParser( self, operators ):
operators['target'] = self._processTarget
operators['config'] = self._processConfig
operators['cc'] = self._processCC
operators['cxx'] = self._processCXX
- operators['install'] = self._processInstall
-
- def InstallAs( self, target, source ):
- if ( self.install ):
- iret = InstallAs( target, source )
- Default( iret )
- else:
- Default( source )
+ operators['install_directory'] = self._processInstallDir
def emit_radiant( self ):
settings = self
lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
Export( 'lib_objects' )
radiant = SConscript( os.path.join( build_dir, 'SConscript.radiant' ) )
- self.InstallAs( 'install/radiant.bin', radiant )
+ Default( InstallAs( os.path.join( self.install_directory, 'radiant.bin' ), radiant ) )
# PIC versions of the libs for the modules
shlib_objects_extra = {}
- for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/cmdlib/cmdlib.vcproj' ]:
+ for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/cmdlib/cmdlib.vcproj' ]:
( libpath, libname ) = os.path.split( project )
libname = os.path.splitext( libname )[0]
config['shared'] = True
'plugins/eclassfgd/fgd.vcproj',
'plugins/entity/entity.vcproj',
'plugins/image/image.vcproj',
- # FIXME: Fix linker flags - xml2, z
- # 'plugins/imagepng/imagepng.vcproj',
+ 'plugins/model/model.vcproj',
+ 'plugins/imagepng/imagepng.vcproj',
'plugins/imagewal/imagewal.vcproj',
'plugins/imagem8/imagem8.vcproj',
'plugins/spritemodel/spritemodel.vcproj',
'plugins/textool/TexTool.vcproj',
+ # 'plugins/sample/sample.vcproj',
'plugins/map/map.vcproj',
'plugins/mapxml/mapxml.vcproj',
'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',
# FIXME Needs splines
# FIXME What is this? Empty dir for me - remove me?
# 'contrib/patches/patches.vcproj',
- # 'contrib/archivewad/archivewad.vcproj',
+ # 'plugins/archivewad/archivewad.vcproj',
- # FIXME Doesn't compile cleanly
- # 'contrib/prtview/PrtView.vcproj',
+ 'contrib/prtview/PrtView.vcproj',
'contrib/hydratoolz/hydratoolz.vcproj',
'contrib/bobtoolz/bobToolz_gtk.vcproj',
'contrib/gtkgensurf/gtkgensurf.vcproj',
+ 'contrib/ufoai/ufoai.vcproj',
'contrib/bkgrnd2d/bkgrnd2d.vcproj'
]:
( libpath, libname ) = os.path.split( project )
shlib_objects = shlib_objects_extra['synapse']
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']
# elif ( libname == 'TexTool' ):
shlib_objects += shlib_objects_extra['cmdlib']
Export( 'project', 'shlib_objects' )
module = SConscript( os.path.join( build_dir, 'SConscript.module' ) )
- self.InstallAs( 'install/modules/%s.so' % libname, module )
+ Default( InstallAs( os.path.join( self.install_directory, 'modules/%s.so' % libname ), module ) )
def emit_q3map2( self ):
settings = self
lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
Export( 'lib_objects' )
q3map2 = SConscript( os.path.join( build_dir, 'SConscript.q3map2' ) )
- self.InstallAs( 'install/q3map2.bin', q3map2 )
-
+ Default( InstallAs( os.path.join( self.install_directory, 'q3map2' ), q3map2 ) )
+
def emit( self ):
try:
else:
self.emit_q3map2()
- def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False ):
+ def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False, useZ = False, usePNG = False ):
env['CC'] = self.cc
env['CXX'] = self.cxx
( ret, xml2 ) = commands.getstatusoutput( 'xml2-config --cflags' )
env.Append( LINKFLAGS = gtkgllibs.split( ' ' ) )
if ( useJPEG ):
env.Append( LIBS = 'jpeg' )
-
+ if ( usePNG ):
+ pnglibs = 'png z'
+ env.Append( LIBS = pnglibs.split( ' ' ) )
+ if ( useZ ):
+ env.Append( LIBS = 'z' )
+
env.Append( CFLAGS = baseflags )
env.Append( CXXFLAGS = baseflags + [ '-fpermissive', '-fvisibility-inlines-hidden' ] )
env.Append( CPPPATH = [ 'include', 'libs' ] )
if ( config == 'debug' ):
env.Append( CFLAGS = [ '-g' ] )
env.Append( CXXFLAGS = [ '-g' ] )
- env.Append( CPPDEFINES = [ '_DEBUG' ] )
+ env.Append( CPPDEFINES = [ '_DEBUG' ] )
else:
- env.Append( CFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations' ] )
- env.Append( CXXFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations' ] )
+ env.Append( CFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations', '-fno-strict-aliasing' ] )
+ env.Append( CXXFLAGS = [ '-O3', '-Winline', '-ffast-math', '-fno-unsafe-math-optimizations','-fno-strict-aliasing' ] )
#env.Append( CFLAGS = [ '-march=pentium3' ] )
# env.Append( LINKFLAGS = [ '-m32' ] )
# parse the config statement line to produce/update an existing config list
-# the configs expose a list of keywords and accepted values, which the engine parses out
+# the configs expose a list of keywords and accepted values, which the engine parses out
class ConfigParser:
def __init__( self ):
self.operators = {}
value_split.pop()
while ( len( value_split ) != 0 ):
value_array.append( value_split.pop() )
- value_split.pop()
+ value_split.pop()
except:
print traceback.print_exception( sys.exc_type, sys.exc_value, sys.exc_traceback )
print 'syntax error (value to array): %s' % ( repr( value_split ) )
return
- return ( name, value_array )
-
+ return ( name, value_array )
+
def parseStatements( self, _configs, statements ):
self.current_config = None
self.configs = _configs
# setup the operator table for this config
# NOTE: have that in self._processOp too
self._setupParser( self.current_config )
-
+
ret = self._parseStatement( s )
if ( ret is None ):
print 'stop statement parse at %s' % repr( s )
projects / xonotic / netradiant.git / blobdiff