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', 'q3map2' )
+ target_choices = utils.Enum( 'radiant', 'q3map2', 'setup' )
config_choices = utils.Enum( 'debug', 'release' )
# aliases
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'
+
+ # 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', 'UFOAIPack', 'Q2WPack' ]
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 _processSetupPlatforms( self, ops ):
+ self.setup_platforms = ops
+
+ def _processSetupPacks( self, ops ):
+ self.setup_packs = ops
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
+ operators['setup_platforms'] = self._processSetupPlatforms
+ operators['setup_packs'] = self._processSetupPacks
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 = {}
'plugins/entity/entity.vcproj',
'plugins/image/image.vcproj',
'plugins/model/model.vcproj',
- # FIXME: Fix linker flags - xml2, z
- # 'plugins/imagepng/imagepng.vcproj',
+ 'plugins/imagepng/imagepng.vcproj',
'plugins/imagewal/imagewal.vcproj',
'plugins/imagem8/imagem8.vcproj',
'plugins/spritemodel/spritemodel.vcproj',
# 'contrib/patches/patches.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['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', q3map2 )
+ Default( InstallAs( os.path.join( self.install_directory, 'q3map2' ), q3map2 ) )
def emit( self ):
else:
self.emit_q3map2()
- def SetupEnvironment( self, env, config, useGtk = False, useGtkGL = False, useJPEG = False ):
+ try:
+ self.target_selected.index( 'setup' )
+ except:
+ pass
+ else:
+ self.Setup()
+
+ 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' ] )
else:
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' ] )
+ def CheckoutOrUpdate( self, svnurl, path ):
+ if ( os.path.exists( path ) ):
+ # NOTE: check the svnurl matches?
+ cmd = 'svn update "%s"' % path
+ print cmd
+ else:
+ cmd = 'svn checkout %s "%s"' % ( svnurl, path )
+ 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' 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 ) )
+
+ def Setup( self ):
+ for platform in self.setup_platforms:
+ if ( platform == 'local' ):
+ # special case, fetch external paks under the local install directory
+ self.FetchGamePaks( self.install_directory )
# 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
projects / xonotic / netradiant.git / blobdiff