-import sys, traceback, platform, re, commands
+import sys, traceback, platform, re, commands, platform
if __name__ != '__main__':
from SCons.Script import *
class Config:
# not used atm, but useful to keep a list in mind
# may use them eventually for the 'all' and other aliases expansions?
- target_choices = utils.Enum( 'radiant' )
+ target_choices = utils.Enum( 'radiant', 'q3map2' )
config_choices = utils.Enum( 'debug', 'release' )
# aliases
def __init__( self ):
# initialize defaults
- self.target_selected = [ 'radiant' ]
+ self.target_selected = [ 'radiant', 'q3map2' ]
self.config_selected = [ 'release' ]
# those are global to each config
- self.cc = 'gcc-4.1'
- self.cxx = 'g++-4.1'
+ 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
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 setupParser( self, operators ):
operators['target'] = self._processTarget
operators['config'] = self._processConfig
operators['cc'] = self._processCC
operators['cxx'] = self._processCXX
+ operators['install'] = self._processInstall
- def emit( self ):
+ def InstallAs( self, target, source ):
+ if ( self.install ):
+ iret = InstallAs( target, source )
+ Default( iret )
+ else:
+ Default( source )
+
+ def emit_radiant( self ):
settings = self
for config_name in self.config_selected:
config = {}
config['name'] = config_name
config['shared'] = False
Export( 'utils', 'settings', 'config' )
- build_dir = os.path.join( 'build', config_name )
+ build_dir = os.path.join( 'build', config_name, 'radiant' )
BuildDir( build_dir, '.', duplicate = 0 )
# left out jpeg6, splines (FIXME: I think jpeg6 is not used at all, can trash?)
lib_objects = []
lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
Export( 'lib_objects' )
radiant = SConscript( os.path.join( build_dir, 'SConscript.radiant' ) )
- InstallAs( 'install/radiant.bin', radiant )
+ self.InstallAs( 'install/radiant.bin', radiant )
# PIC versions of the libs for the modules
shlib_objects_extra = {}
shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
for project in [ 'plugins/vfspk3/vfspk3.vcproj',
- 'plugins/image/image.vcproj',
+ 'plugins/vfspak/vfspak.vcproj',
+ 'plugins/vfswad/vfswad.vcproj',
+ 'plugins/eclassfgd/fgd.vcproj',
'plugins/entity/entity.vcproj',
+ 'plugins/image/image.vcproj',
+ # FIXME: Fix linker flags - xml2, z
+ # 'plugins/imagepng/imagepng.vcproj',
+ 'plugins/imagewal/imagewal.vcproj',
+ 'plugins/imagem8/imagem8.vcproj',
+ 'plugins/spritemodel/spritemodel.vcproj',
+ 'plugins/textool/TexTool.vcproj',
'plugins/map/map.vcproj',
'plugins/mapxml/mapxml.vcproj',
'plugins/shaders/shaders.vcproj',
- 'plugins/surface/surface.vcproj'
- ]:
+ 'plugins/surface/surface.vcproj',
+ 'plugins/surface_quake2/surface_quake2.vcproj',
+ 'plugins/surface_heretic2/surface_heretic2.vcproj',
+ # FIXME Needs splines
+ # 'contrib/camera/camera.vcproj',
+
+ # FIXME What is this? Empty dir for me - remove me?
+ # 'contrib/patches/patches.vcproj',
+ # 'contrib/archivewad/archivewad.vcproj',
+
+ # FIXME Doesn't compile cleanly
+ # 'contrib/prtview/PrtView.vcproj',
+ 'contrib/hydratoolz/hydratoolz.vcproj',
+ 'contrib/bobtoolz/bobToolz_gtk.vcproj',
+ 'contrib/gtkgensurf/gtkgensurf.vcproj',
+ 'contrib/bkgrnd2d/bkgrnd2d.vcproj'
+ ]:
( libpath, libname ) = os.path.split( project )
libname = os.path.splitext( libname )[0]
shlib_objects = shlib_objects_extra['synapse']
if ( libname == 'entity' ):
shlib_objects += shlib_objects_extra['mathlib']
- if ( libname == 'map' ):
+# elif ( libname == 'spritemodel' ):
+# shlib_objects += shlib_objects_extra['mathlib']
+# elif ( libname == 'TexTool' ):
+# shlib_objects += shlib_objects_extra['mathlib']
+ elif ( libname == 'map' ):
shlib_objects += shlib_objects_extra['cmdlib']
Export( 'project', 'shlib_objects' )
module = SConscript( os.path.join( build_dir, 'SConscript.module' ) )
- InstallAs( 'install/modules/%s.so' % libname, module )
+ self.InstallAs( 'install/modules/%s.so' % libname, module )
+
+ def emit_q3map2( self ):
+ settings = self
+ for config_name in self.config_selected:
+ config = {}
+ config['name'] = config_name
+ config['shared'] = False
+ Export( 'utils', 'settings', 'config' )
+ build_dir = os.path.join( 'build', config_name, 'q3map2' )
+ BuildDir( build_dir, '.', duplicate = 0 )
+ lib_objects = []
+ for project in [ 'libs/cmdlib/cmdlib.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' )
+ 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', q3map2 )
+
+
+ def emit( self ):
+ try:
+ self.target_selected.index( 'radiant' )
+ except:
+ pass
+ else:
+ self.emit_radiant()
+ try:
+ self.target_selected.index( 'q3map2' )
+ except:
+ pass
+ else:
+ self.emit_q3map2()
def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False ):
env['CC'] = self.cc
env.Append( LINKFLAGS = xml2libs.split( ' ' ) )
baseflags = [ '-pipe', '-Wall', '-fmessage-length=0', '-fvisibility=hidden', xml2.split( ' ' ) ]
# baseflags += [ '-m32' ]
+
+ if ( self.platform == 'Darwin' ):
+ env.Append( CPPPATH = [ '/Developer/SDKs/MacOSX10.4u.sdk/usr/X11R6/include' ] )
+
if ( useGtk ):
( ret, gtk2 ) = commands.getstatusoutput( 'pkg-config gtk+-2.0 --cflags' )
if ( ret != 0 ):
baseflags += glib.split( ' ' )
gliblibs = commands.getoutput( 'pkg-config glib-2.0 --libs' )
env.Append( LINKFLAGS = gliblibs.split( ' ' ) )
+
if ( useGtkGL ):
( ret, gtkgl ) = commands.getstatusoutput( 'pkg-config gtkglext-1.0 --cflags' )
if ( ret != 0 ):
env.Append( CPPDEFINES = [ 'Q_NO_STLPORT' ] )
if ( config == 'debug' ):
env.Append( CFLAGS = [ '-g' ] )
+ env.Append( CXXFLAGS = [ '-g' ] )
env.Append( CPPDEFINES = [ '_DEBUG' ] )
else:
- env.Append( CFLAGS = [ '-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' ] )