if __name__ != '__main__':
from SCons.Script import *
-import utils
+import utils, urllib2, zipfile, shutil
# config = debug release
# aliases are going to be very needed here
config['shared'] = False
Export( 'utils', 'settings', 'config' )
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?)
+ VariantDir( build_dir, '.', duplicate = 0 )
lib_objects = []
- for project in [ 'libs/synapse/synapse.vcproj', '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' ]:
+ for project in [ 'libs/synapse/synapse.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj' ]:
Export( 'project' )
lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
Export( 'lib_objects' )
# PIC versions of the libs for the modules
shlib_objects_extra = {}
- for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/cmdlib/cmdlib.vcproj' ]:
+ for project in [ 'libs/synapse/synapse.vcproj', 'libs/mathlib/mathlib.vcproj', 'libs/picomodel/picomodel.vcproj', 'libs/cmdlib/cmdlib.vcproj', 'libs/splines/splines.vcproj' ]:
( libpath, libname ) = os.path.split( project )
libname = os.path.splitext( libname )[0]
config['shared'] = True
Export( 'project', 'config' )
build_dir = os.path.join( 'build', config_name, 'shobjs' )
- BuildDir( build_dir, '.', duplicate = 0 )
+ VariantDir( build_dir, '.', duplicate = 0 )
shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
for project in [ 'plugins/vfspk3/vfspk3.vcproj',
'plugins/model/model.vcproj',
'plugins/imagepng/imagepng.vcproj',
'plugins/imagewal/imagewal.vcproj',
+ 'plugins/imagehl/imagehl.vcproj',
'plugins/imagem8/imagem8.vcproj',
'plugins/spritemodel/spritemodel.vcproj',
- 'plugins/textool/TexTool.vcproj',
- # 'plugins/sample/sample.vcproj',
+ 'plugins/textool/textool.vcproj',
'plugins/map/map.vcproj',
'plugins/mapxml/mapxml.vcproj',
'plugins/shaders/shaders.vcproj',
'plugins/surface_ufoai/surface_ufoai.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',
- # 'plugins/archivewad/archivewad.vcproj',
-
- 'contrib/prtview/PrtView.vcproj',
+ 'contrib/camera/camera.vcproj',
+ 'contrib/prtview/prtview.vcproj',
'contrib/hydratoolz/hydratoolz.vcproj',
- 'contrib/bobtoolz/bobToolz_gtk.vcproj',
+ 'contrib/bobtoolz/bobtoolz.vcproj',
'contrib/gtkgensurf/gtkgensurf.vcproj',
'contrib/ufoai/ufoai.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' ):
+ # The old code assigned shlib_objects to shlib_objects_extra['synapse'],
+ # and this resulted in a non-copy. Stuff is added to shlib_objects below.
+ # So we need the explicit copy so we don't modify shlib_objects_extra['synapse'].
+ shlib_objects = shlib_objects_extra['synapse'][:]
+ if ( libname == 'camera' ):
+ shlib_objects += shlib_objects_extra['splines']
+ elif ( libname == 'entity' ):
shlib_objects += shlib_objects_extra['mathlib']
+ elif ( libname == 'map' ):
+ shlib_objects += shlib_objects_extra['cmdlib']
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['mathlib']
- elif ( libname == 'map' ):
+ shlib_objects += shlib_objects_extra['mathlib']
+ elif ( libname == 'spritemodel' ):
+ shlib_objects += shlib_objects_extra['mathlib']
+ elif ( libname == 'textool' ):
+ shlib_objects += shlib_objects_extra['mathlib']
+ elif ( libname == 'bobtoolz' ):
+ shlib_objects += shlib_objects_extra['mathlib']
shlib_objects += shlib_objects_extra['cmdlib']
Export( 'project', 'shlib_objects' )
module = SConscript( os.path.join( build_dir, 'SConscript.module' ) )
config['shared'] = False
Export( 'utils', 'settings', 'config' )
build_dir = os.path.join( 'build', config_name, 'q3map2' )
- BuildDir( build_dir, '.', duplicate = 0 )
+ VariantDir( 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_VC9.vcproj' ]:
+ for project in [ 'tools/quake3/common/quake3-common.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' )
env.Append( CXXFLAGS = [ '-g' ] )
env.Append( CPPDEFINES = [ '_DEBUG' ] )
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 = [ '-O2', '-fno-strict-aliasing' ] )
+ env.Append( CXXFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
def CheckoutOrUpdate( self, svnurl, path ):
if ( os.path.exists( path ) ):
def FetchGamePaks( self, path ):
for pak in self.setup_packs:
if ( pak == 'Q3Pack' or pak == 'UrTPack' or pak == 'UFOAIPack' or pak == 'Q2WPack' or pak == 'ReactionPack' ):
- svnurl = 'https://zerowing.idsoftware.com/svn/radiant.gamepacks/%s/trunk' % pak
+ svnurl = 'svn://svn.icculus.org/gtkradiant-gamepacks/%s/trunk' % pak
self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) )
+ def CopyTree( self, src, dst):
+ for root, dirs, files in os.walk( src ):
+ target_dir = os.path.join( dst, root[root.find( '/' )+1:] )
+ print ( target_dir )
+ if ( not os.path.exists( target_dir ) ):
+ os.mkdir( target_dir )
+
+ for file in files:
+ shutil.copy( os.path.join( root, file ), os.path.join( target_dir, file ) )
+
+
+
def Setup( self ):
try:
self.setup_platforms.index( 'local' )
if ( self.platform == 'Windows' ):
backup_cwd = os.getcwd()
for lib_archive in [
- 'gtk+-bundle-2.16.6-20100912-2-win32.zip',
+ 'gtk+-bundle-2.16.6-20100912-3-win32.zip',
'gtkglext-1.2.0-3-win32.zip',
'libxml2-2.7.3-2-win32.zip',
'jpeg-8c-4-win32.zip',
'STLport-5.2.1-4.zip'
]:
if ( not os.path.exists( lib_archive ) ):
- cmd = [ 'wget', '-N', 'http://porky.nerius.com/radiant-libs-win32/%s' % lib_archive ]
- print( repr( cmd ) )
- subprocess.check_call( cmd )
+ print( 'downloading %s' % lib_archive )
+ archive_web_request = urllib2.urlopen( 'http://icculus.org/gtkradiant/files/1.6.2/%s' % lib_archive )
+ archive_File = open( lib_archive, 'wb' )
+ while True:
+ data = archive_web_request.read( 1048576 ) #read 1mb at a time
+ if not data:
+ break
+ archive_File.write( data )
+
+ archive_web_request.close()
+ archive_File.close()
+
+ print( 'unpacking %s' % lib_archive )
lib_archive_path = os.path.abspath( lib_archive )
os.chdir( os.path.dirname( backup_cwd ) )
- cmd = [ 'unzip', '-o', lib_archive_path ]
- print( repr( cmd ) )
- subprocess.check_call( cmd )
+
+ archive_Zip = zipfile.ZipFile( lib_archive_path, 'r' )
+ archive_Zip.extractall()
+ archive_Zip.close()
+
os.chdir( backup_cwd )
# copy all the dependent runtime data to the install directory
'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll',
'libxml2-2.7.3/bin/libxml2-2.dll'
]:
- cmd = [ 'cp', '-v', os.path.join( srcdir, dll ), 'install' ]
- print( repr( cmd ) )
- subprocess.check_call( cmd )
+ shutil.copy( os.path.join( srcdir, dll ), 'install' )
+
for extra in [
'gtk-2.16.6/etc',
'gtk-2.16.6/share',
'gtkglext-1.2.0/share',
'libxml2-2.7.3/share'
]:
- cmd = [ 'cp', '-r', '-v', os.path.join( srcdir, extra ), 'install' ]
- print( repr( cmd ) )
- subprocess.check_call( cmd )
+ self.CopyTree( os.path.join( srcdir, extra ), 'install' )
# 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