diff --git a/.cproject b/.cproject
index 2d63c2af..fa0c4e87 100644
--- a/.cproject
+++ b/.cproject
@@ -29,7 +29,7 @@
-
+
@@ -504,7 +504,7 @@
-
diff --git a/.gitignore b/.gitignore
index 5d7e074c..088cad52 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,9 @@
+/apple/target/*
+/install/games
+/install/installs
+/install/q3data
/install/q3map2
+/install/q3map2_urt
/install/radiant.bin
/.sconsign.dblite
/site.sconf
@@ -6,3 +11,4 @@
*.pyc
*.so
.settings
+.DS_Store
diff --git a/.project b/.project
index 73e7fc82..8e0c1001 100644
--- a/.project
+++ b/.project
@@ -5,6 +5,11 @@
+
+ org.python.pydev.PyDevBuilder
+
+
+
org.eclipse.cdt.managedbuilder.core.genmakebuilder
clean,full,incremental,
@@ -79,5 +84,6 @@
org.eclipse.cdt.core.ccnature
org.eclipse.cdt.managedbuilder.core.managedBuildNature
org.eclipse.cdt.managedbuilder.core.ScannerConfigNature
+ org.python.pydev.pythonNature
diff --git a/.pydevproject b/.pydevproject
new file mode 100644
index 00000000..a9cca037
--- /dev/null
+++ b/.pydevproject
@@ -0,0 +1,7 @@
+
+
+
+
+Default
+python 2.7
+
diff --git a/apple/GtkRadiant.app/Contents/Info.plist b/apple/GtkRadiant.app/Contents/Info.plist
new file mode 100644
index 00000000..9f049a4d
--- /dev/null
+++ b/apple/GtkRadiant.app/Contents/Info.plist
@@ -0,0 +1,28 @@
+
+
+
+
+ CFBundleDevelopmentRegion
+ English
+ CFBundleDisplayName
+ GtkRadiant
+ CFBundleExecutable
+ radiant
+ CFBundleIconFile
+ radiant.icns
+ CFBundleIdentifier
+ org.icculus.gtkradiant
+ CFBundleName
+ GtkRadiant
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ 1.6.4
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ 1.6.4
+ LSMinimumSystemVersion
+ 10.6
+
+
diff --git a/apple/GtkRadiant.app/Contents/MacOS/radiant b/apple/GtkRadiant.app/Contents/MacOS/radiant
new file mode 100755
index 00000000..64f07358
--- /dev/null
+++ b/apple/GtkRadiant.app/Contents/MacOS/radiant
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+RADIANT_HOME=$(dirname "$0")
+RADIANT_HOME=${RADIANT_HOME/GtkRadiant.app*/GtkRadiant.app}
+
+echo
+echo "Starting GtkRadiant in ${RADIANT_HOME}"
+echo
+
+set -x
+
+resources="${RADIANT_HOME}/Contents/Resources"
+
+export FONTCONFIG_PATH="${resources}/etc/fonts"
+export FC_DEBUG=1024
+
+export GDK_GL_LIBGL_PATH="${resources}/lib/libGL.1.dylib"
+export GDK_GL_LIBGLU_PATH="${resources}/lib/libGLU.1.dylib"
+
+export GDK_PATH="${resources}"
+export GDK_PIXBUF_MODULE_FILE="${resources}/etc/gtk-2.0/gdk-pixbuf.loaders"
+
+export GOBJECT_PATH="${resources}"
+
+export GTK_DATA_PREFIX="${resources}"
+export GTK_EXE_PREFIX="${resources}"
+export GTK_PATH="${resources}"
+
+export PANGO_SYSCONFDIR="${resources}/etc"
+export PANGO_LIBDIR="${resources}/lib"
+
+cd "${resources}/install"
+./radiant.bin &
+
+set +x
\ No newline at end of file
diff --git a/apple/GtkRadiant.app/Contents/Resources/etc/fonts/fonts.conf b/apple/GtkRadiant.app/Contents/Resources/etc/fonts/fonts.conf
new file mode 100644
index 00000000..7183a4be
--- /dev/null
+++ b/apple/GtkRadiant.app/Contents/Resources/etc/fonts/fonts.conf
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+ /usr/X11/lib/X11/fonts
+ /Library/Fonts
+ /System/Library/Fonts
+ fonts
+
+
+
+
+ mono
+
+
+ monospace
+
+
+
+
+
+
+ sans serif
+
+
+ sans-serif
+
+
+
+
+
+
+ sans
+
+
+ sans-serif
+
+
+
+
+ fontconfig
+
+
+
+
+ 0x0020
+ 0x00A0
+ 0x00AD
+ 0x034F
+ 0x0600
+ 0x0601
+ 0x0602
+ 0x0603
+ 0x06DD
+ 0x070F
+ 0x115F
+ 0x1160
+ 0x1680
+ 0x17B4
+ 0x17B5
+ 0x180E
+ 0x2000
+ 0x2001
+ 0x2002
+ 0x2003
+ 0x2004
+ 0x2005
+ 0x2006
+ 0x2007
+ 0x2008
+ 0x2009
+ 0x200A
+ 0x200B
+ 0x200C
+ 0x200D
+ 0x200E
+ 0x200F
+ 0x2028
+ 0x2029
+ 0x202A
+ 0x202B
+ 0x202C
+ 0x202D
+ 0x202E
+ 0x202F
+ 0x205F
+ 0x2060
+ 0x2061
+ 0x2062
+ 0x2063
+ 0x206A
+ 0x206B
+ 0x206C
+ 0x206D
+ 0x206E
+ 0x206F
+ 0x2800
+ 0x3000
+ 0x3164
+ 0xFEFF
+ 0xFFA0
+ 0xFFF9
+ 0xFFFA
+ 0xFFFB
+
+
+
+ 30
+
+
+
+
+
diff --git a/apple/GtkRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc b/apple/GtkRadiant.app/Contents/Resources/etc/gtk-2.0/gtkrc
new file mode 100644
index 00000000..e69de29b
diff --git a/apple/GtkRadiant.app/Contents/Resources/etc/pango/pangorc b/apple/GtkRadiant.app/Contents/Resources/etc/pango/pangorc
new file mode 100644
index 00000000..f56d3437
--- /dev/null
+++ b/apple/GtkRadiant.app/Contents/Resources/etc/pango/pangorc
@@ -0,0 +1 @@
+[Pango]
\ No newline at end of file
diff --git a/apple/GtkRadiant.app/Contents/Resources/lib/.turd b/apple/GtkRadiant.app/Contents/Resources/lib/.turd
new file mode 100644
index 00000000..e69de29b
diff --git a/apple/GtkRadiant.app/Contents/Resources/radiant.icns b/apple/GtkRadiant.app/Contents/Resources/radiant.icns
new file mode 100644
index 00000000..4f1db4e4
Binary files /dev/null and b/apple/GtkRadiant.app/Contents/Resources/radiant.icns differ
diff --git a/apple/GtkRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd b/apple/GtkRadiant.app/Contents/Resources/share/gtk-2.0/icons/.turd
new file mode 100644
index 00000000..e69de29b
diff --git a/apple/GtkRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd b/apple/GtkRadiant.app/Contents/Resources/share/gtk-2.0/themes/.turd
new file mode 100644
index 00000000..e69de29b
diff --git a/apple/Makefile b/apple/Makefile
new file mode 100644
index 00000000..31081dd9
--- /dev/null
+++ b/apple/Makefile
@@ -0,0 +1,77 @@
+# Makefile for GtkRadiant.app, requires http://macdylibbundler.sourceforge.net/
+
+INSTALL = ../install
+TARGET = target
+RESOURCES = $(TARGET)/GtkRadiant.app/Contents/Resources
+CONFDIR = $(RESOURCES)/etc
+DATADIR = $(RESOURCES)/share
+LIBDIR = $(RESOURCES)/lib
+INSTDIR = $(RESOURCES)/install
+PREFIX_SED_EXPR = 's:/opt/local:@executable_path/..:g'
+VERSION = 1.6.4
+DMG = $(TARGET)/GtkRadiant-$(VERSION).dmg
+VOLUME_NAME = "GtkRadiant $(VERSION)"
+
+all: install bundle
+
+-pre-install:
+ install -d $(TARGET)
+ cp -r GtkRadiant.app $(TARGET)
+ find $(TARGET) -name .turd -delete
+
+-gtk-runtime-gdk-pixbuf-2.0:
+ cp -r /opt/local/lib/gdk-pixbuf-2.0 $(LIBDIR)
+ find $(LIBDIR)/gdk-pixbuf-2.0 -type f ! -name "*.so" -delete
+
+ gdk-pixbuf-query-loaders | sed $(PREFIX_SED_EXPR) > \
+ $(CONFDIR)/gtk-2.0/gdk-pixbuf.loaders
+
+-gtk-runtime-pango:
+ cp -r /opt/local/lib/pango $(LIBDIR)
+ find $(LIBDIR)/pango -type f ! -name "*.so" -delete
+
+ pango-querymodules | sed $(PREFIX_SED_EXPR) > \
+ $(CONFDIR)/pango/pango.modules
+
+-gtk-runtime: -gtk-runtime-gdk-pixbuf-2.0 -gtk-runtime-pango
+ cp -r /opt/local/lib/gtk-2.0 $(LIBDIR)
+ find $(LIBDIR)/gtk-2.0 -type f ! -name "*.so" -delete
+
+ rm -rf $(LIBDIR)/gtk-2.0/{includes,modules}
+ rm -rf $(LIBDIR)/gtk-2.0/*/printbackends
+
+ cp -r /opt/local/share/themes/Default $(RESOURCES)/share
+
+ gtk-query-immodules-2.0 | sed $(PREFIX_SED_EXPR) > \
+ $(CONFDIR)/gtk-2.0/gtk.immodules
+
+install: -pre-install -gtk-runtime
+ cp -r $(INSTALL) $(RESOURCES)
+ rm -rf `find $(INSTDIR)/installs -type d -name .svn`
+
+bundle:
+
+ # The Radiant plugins (modules) are a little funky
+ # Some of them are actually linked against the build directory
+
+ ln -s ../build ./build
+
+ dylibbundler -b \
+ -x $(INSTDIR)/radiant.bin \
+ -x $(INSTDIR)/q3map2 \
+ -x $(INSTDIR)/q3map2_urt \
+ -x $(INSTDIR)/q3data \
+ `find $(INSTDIR)/modules -name "*.so" | xargs -I {} echo -x {}` \
+ `find $(LIBDIR) -name "*.so" | xargs -I {} echo -x {}` \
+ -d $(LIBDIR) -of -p @executable_path/../lib
+
+ rm -f build
+
+image:
+ find $(TARGET) -name .DS_Store -delete
+ ln -f -s /Applications $(TARGET)/Applications
+ hdiutil create -ov $(DMG) -srcfolder $(TARGET) -volname $(VOLUME_NAME)
+ rm $(TARGET)/Applications
+
+clean:
+ rm -rf $(TARGET)/*
diff --git a/config.py b/config.py
index f11318f1..23b84b12 100644
--- a/config.py
+++ b/config.py
@@ -2,7 +2,7 @@ import sys, os, traceback, platform, re, commands, platform, subprocess
import urllib2, zipfile, shutil, pprint
if __name__ != '__main__':
- from SCons.Script import *
+ from SCons.Script import *
import utils
@@ -10,507 +10,498 @@ GTK_PREFIX='gtk-2.24.10'
GTK64_PREFIX='gtk-2.22.1_win64'
class Config:
- # aliases
- # 'all' -> for each choices
- # 'gamecode' for the targets, 'game' 'cgame' 'ui'
+ # aliases
+ # 'all' -> for each choices
+ # 'gamecode' for the targets, 'game' 'cgame' 'ui'
- def __init__( self ):
- # initialize defaults
- self.target_selected = [ 'radiant', 'q3map2', 'q3data', 'setup' ]
- self.config_selected = [ 'release' ]
- # those are global to each config
- self.platform = platform.system()
- self.cc = 'gcc'
- self.cxx = 'g++'
- self.install_directory = 'install'
+ def __init__( self ):
+ # initialize defaults
+ self.target_selected = [ 'radiant', 'q3map2', 'q3data', 'setup' ]
+ self.config_selected = [ 'release' ]
+ # those are global to each config
+ self.platform = platform.system()
+ 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', 'ETPack', 'QLPack', 'Q2WPack' ]
+ # 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', 'ETPack', 'QLPack', 'Q2WPack' ]
- def __repr__( self ):
- return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
+ def __repr__( self ):
+ return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )
- def _processTarget( self, ops ):
- self.target_selected = ops
+ def _processTarget( self, ops ):
+ self.target_selected = ops
- def _processConfig( self, ops ):
- self.config_selected = ops
+ def _processConfig( self, ops ):
+ self.config_selected = ops
- def _processCC( self, ops ):
- self.cc = ops
+ def _processCC( self, ops ):
+ self.cc = ops
- def _processCXX( self, ops ):
- self.cxx = ops
+ def _processCXX( self, ops ):
+ self.cxx = ops
- def _processInstallDir( self, ops ):
- self.install_directory = os.path.normpath( os.path.expanduser( ops[0] ) )
+ def _processInstallDir( self, ops ):
+ self.install_directory = os.path.normpath( os.path.expanduser( ops[0] ) )
- def _processSetupPlatforms( self, ops ):
- self.setup_platforms = ops
+ def _processSetupPlatforms( self, ops ):
+ self.setup_platforms = ops
- def _processSetupPacks( self, ops ):
- self.setup_packs = 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_directory'] = self._processInstallDir
- operators['setup_platforms'] = self._processSetupPlatforms
- operators['setup_packs'] = self._processSetupPacks
+ def setupParser( self, operators ):
+ operators['target'] = self._processTarget
+ operators['config'] = self._processConfig
+ operators['cc'] = self._processCC
+ operators['cxx'] = self._processCXX
+ operators['install_directory'] = self._processInstallDir
+ operators['setup_platforms'] = self._processSetupPlatforms
+ operators['setup_packs'] = self._processSetupPacks
- 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, 'radiant' )
- 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' ]:
- Export( 'project' )
- lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
- Export( 'lib_objects' )
- radiant = SConscript( os.path.join( build_dir, 'SConscript.radiant' ) )
- Default( InstallAs( os.path.join( self.install_directory, 'radiant.bin' ), radiant ) )
+ 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, 'radiant' )
+ 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' ]:
+ Export( 'project' )
+ lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
+ Export( 'lib_objects' )
+ radiant = SConscript( os.path.join( build_dir, 'SConscript.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/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' )
- VariantDir( build_dir, '.', duplicate = 0 )
- shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
+ # 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', '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' )
+ VariantDir( build_dir, '.', duplicate = 0 )
+ shlib_objects_extra[libname] = SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
- for project in [ 'plugins/vfsqlpk3/vfsqlpk3.vcproj',
- 'plugins/vfspk3/vfspk3.vcproj',
- 'plugins/vfspak/vfspak.vcproj',
- 'plugins/vfswad/vfswad.vcproj',
- 'plugins/eclassfgd/fgd.vcproj',
- 'plugins/entity/entity.vcproj',
- 'plugins/image/image.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/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',
- 'contrib/camera/camera.vcproj',
- 'contrib/prtview/prtview.vcproj',
- 'contrib/hydratoolz/hydratoolz.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]
- # 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']
- 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' ) )
- Default( InstallAs( os.path.join( self.install_directory, 'modules/%s.so' % libname ), module ) )
+ for project in [ 'plugins/vfsqlpk3/vfsqlpk3.vcproj',
+ 'plugins/vfspk3/vfspk3.vcproj',
+ 'plugins/vfspak/vfspak.vcproj',
+ 'plugins/vfswad/vfswad.vcproj',
+ 'plugins/eclassfgd/fgd.vcproj',
+ 'plugins/entity/entity.vcproj',
+ 'plugins/image/image.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/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',
+ 'contrib/camera/camera.vcproj',
+ 'contrib/prtview/prtview.vcproj',
+ 'contrib/hydratoolz/hydratoolz.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]
+ # 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']
+ 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' ) )
+ Default( InstallAs( os.path.join( self.install_directory, 'modules/%s.so' % libname ), module ) )
- def emit_q3map2( self, urt = False ):
- if ( urt ):
- compiler_name = 'q3map2_urt'
- sconscript_name = 'SConscript.q3map2.urt'
- else:
- compiler_name = 'q3map2'
- sconscript_name = 'SConscript.q3map2'
- 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, compiler_name )
- VariantDir( build_dir, '.', duplicate = 0 )
- lib_objects = []
- 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' )
+ def emit_q3map2( self, urt = False ):
+ if ( urt ):
+ compiler_name = 'q3map2_urt'
+ sconscript_name = 'SConscript.q3map2.urt'
+ else:
+ compiler_name = 'q3map2'
+ sconscript_name = 'SConscript.q3map2'
+ 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, compiler_name )
+ VariantDir( build_dir, '.', duplicate = 0 )
+ lib_objects = []
+ 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' )
- q3map2 = SConscript( os.path.join( build_dir, sconscript_name ) )
- Default( InstallAs( os.path.join( self.install_directory, compiler_name ), q3map2 ) )
+ q3map2 = SConscript( os.path.join( build_dir, sconscript_name ) )
+ Default( InstallAs( os.path.join( self.install_directory, compiler_name ), q3map2 ) )
- def emit_q3data( 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, 'q3data' )
- VariantDir( build_dir, '.', duplicate = 0 )
- lib_objects = []
- for project in [ 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj' ]:
- Export( 'project' )
- lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
- Export( 'lib_objects' )
- q3data = SConscript( os.path.join( build_dir, 'SConscript.q3data' ) )
- Default( InstallAs( os.path.join( self.install_directory, 'q3data' ), q3data ) )
+ def emit_q3data( 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, 'q3data' )
+ VariantDir( build_dir, '.', duplicate = 0 )
+ lib_objects = []
+ for project in [ 'libs/mathlib/mathlib.vcproj', 'libs/l_net/l_net.vcproj', 'libs/ddslib/ddslib.vcproj' ]:
+ Export( 'project' )
+ lib_objects += SConscript( os.path.join( build_dir, 'SConscript.lib' ) )
+ Export( 'lib_objects' )
+ q3data = SConscript( os.path.join( build_dir, 'SConscript.q3data' ) )
+ Default( InstallAs( os.path.join( self.install_directory, 'q3data' ), q3data ) )
- def emit( self ):
- if 'radiant' in self.target_selected:
- self.emit_radiant()
- if 'q3map2' in self.target_selected:
- self.emit_q3map2( urt = False )
- self.emit_q3map2( urt = True )
- if 'q3data' in self.target_selected:
- self.emit_q3data()
- if 'setup' in self.target_selected:
- self.Setup()
+ def emit( self ):
+ if 'radiant' in self.target_selected:
+ self.emit_radiant()
+ if 'q3map2' in self.target_selected:
+ self.emit_q3map2( urt = False )
+ self.emit_q3map2( urt = True )
+ if 'q3data' in self.target_selected:
+ self.emit_q3data()
+ if 'setup' in self.target_selected:
+ self.Setup()
- if ( self.platform == 'Linux' ):
- finish_command = Command( 'finish', [], self.FinishBuild )
- Depends( finish_command, DEFAULT_TARGETS )
- Default( finish_command )
+ if ( self.platform == 'Linux' ):
+ finish_command = Command( 'finish', [], self.FinishBuild )
+ Depends( finish_command, DEFAULT_TARGETS )
+ Default( finish_command )
- 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' )
- if ( ret != 0 ):
- print 'xml2-config failed'
- assert( False )
- xml2libs = commands.getoutput( 'xml2-config --libs' )
- env.Append( LINKFLAGS = xml2libs.split( ' ' ) )
- baseflags = [ '-pipe', '-Wall', '-fmessage-length=0', '-fvisibility=hidden', xml2.split( ' ' ) ]
+ 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' )
+ if ( ret != 0 ):
+ print 'xml2-config failed'
+ assert( False )
+ xml2libs = commands.getoutput( 'xml2-config --libs' )
+ env.Append( LINKFLAGS = xml2libs.split( ' ' ) )
+ baseflags = [ '-pipe', '-Wall', '-fmessage-length=0', '-fvisibility=hidden', xml2.split( ' ' ) ]
- if ( useGtk ):
- env.ParseConfig( 'pkg-config gtk+-2.0 --cflags --libs' )
- env.ParseConfig( 'pkg-config x11 --cflags --libs' )
- else:
- # always setup at least glib
- env.ParseConfig( 'pkg-config glib-2.0 --cflags --libs' )
+ if ( useGtk ):
+ env.ParseConfig( 'pkg-config gtk+-2.0 --cflags --libs' )
+ env.ParseConfig( 'pkg-config x11 --cflags --libs' )
+ else:
+ # always setup at least glib
+ env.ParseConfig( 'pkg-config glib-2.0 --cflags --libs' )
- if ( useGtkGL ):
- env.ParseConfig( 'pkg-config glu --cflags --libs' )
- env.ParseConfig( 'pkg-config gtkglext-1.0 --cflags --libs' )
- if ( useJPEG ):
- env.Append( LIBS = 'jpeg' )
- if ( usePNG ):
- pnglibs = 'png'
- env.Append( LIBS = pnglibs.split( ' ' ) )
- env.ParseConfig( 'pkg-config zlib --cflags --libs' )
- if ( useZ ):
- env.ParseConfig( 'pkg-config zlib --cflags --libs' )
+ if ( useGtkGL ):
+ env.ParseConfig( 'pkg-config glu --cflags --libs' )
+ env.ParseConfig( 'pkg-config gtkglext-1.0 --cflags --libs' )
+ if ( useJPEG ):
+ env.Append( LIBS = 'jpeg' )
+ if ( usePNG ):
+ pnglibs = 'png'
+ env.Append( LIBS = pnglibs.split( ' ' ) )
+ env.ParseConfig( 'pkg-config zlib --cflags --libs' )
+ if ( useZ ):
+ env.ParseConfig( 'pkg-config zlib --cflags --libs' )
- env.Append( CCFLAGS = baseflags )
- env.Append( CXXFLAGS = baseflags + [ '-fpermissive', '-fvisibility-inlines-hidden' ] )
- env.Append( CPPPATH = [ 'include', 'libs' ] )
- 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 = [ '-O2', '-fno-strict-aliasing' ] )
- env.Append( CXXFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
+ env.Append( CCFLAGS = baseflags )
+ env.Append( CXXFLAGS = baseflags + [ '-fpermissive', '-fvisibility-inlines-hidden' ] )
+ env.Append( CPPPATH = [ 'include', 'libs' ] )
+ 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 = [ '-O2', '-fno-strict-aliasing' ] )
+ env.Append( CXXFLAGS = [ '-O2', '-fno-strict-aliasing' ] )
- # this lets us catch libjpg and libpng libraries that we put in the same directory as radiant.bin
- env.Append( LINKFLAGS = '-Wl,-rpath,.' )
+ # this lets us catch libjpg and libpng libraries that we put in the same directory as radiant.bin
+ env.Append( LINKFLAGS = '-Wl,-rpath,.' )
+
+ # On Mac, we pad headers so that we may rewrite them for packaging
+ if ( self.platform == 'Darwin' ) :
+ env.Append( LINKFLAGS = [ '-headerpad_max_install_names' ] )
- def CheckoutOrUpdate( self, svnurl, path ):
- if ( os.path.exists( path ) ):
- cmd = [ 'svn', 'update', path ]
- else:
- cmd = [ 'svn', 'checkout', svnurl, path ]
- print( repr( cmd ) )
- subprocess.check_call( cmd )
+ def CheckoutOrUpdate( self, svnurl, path ):
+ if ( os.path.exists( path ) ):
+ cmd = [ 'svn', 'update', path ]
+ else:
+ cmd = [ 'svn', 'checkout', svnurl, path ]
+ print( repr( cmd ) )
+ subprocess.check_call( cmd )
- def FetchGamePaks( self, path ):
- for pak in self.setup_packs:
- if ( pak == 'Q2WPack' ):
- continue
- svnurl = 'svn://svn.icculus.org/gtkradiant-gamepacks/%s/trunk' % pak
- self.CheckoutOrUpdate( svnurl, os.path.join( path, 'installs', pak ) )
+ def FetchGamePaks( self, path ):
+ for pak in self.setup_packs:
+ 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 )
- if 'Q2WPack' in self.setup_packs:
- if ( os.path.exists( 'quake2world' ) ):
- subprocess.check_call( [ 'git', 'pull', ], cwd = 'quake2world' )
- else:
- cmd = [ 'git', 'clone', 'git://github.com/jdolan/quake2world.git' ]
- subprocess.check_call( cmd )
- # squash and sync..
- if ( os.path.exists( 'install/installs/Q2WPack' ) ):
- shutil.rmtree( 'install/installs/Q2WPack/' )
- shutil.copytree( 'quake2world/gtkradiant/Q2WPack/', 'install/installs/Q2WPack/' )
+ for file in files:
+ shutil.copy( os.path.join( root, file ), os.path.join( target_dir, file ) )
- 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 )
+ def Setup( self ):
+ try:
+ self.setup_platforms.index( 'local' )
+ except:
+ pass
+ else:
+ # special case, fetch external paks under the local install directory
+ self.FetchGamePaks( self.install_directory )
+ # NOTE: unrelated to self.setup_platforms - grab support files and binaries and install them
+ if ( self.platform == 'Windows' ):
+ backup_cwd = os.getcwd()
+ for lib_archive in [
+ 'STLport-5.2.1-GtkRadiant.zip',
+ 'gtk-bundle-2.24.10-GtkRadiant.zip',
+ 'gtk-bundle-2.22.1-win64-GtkRadiant.zip',
+ 'jpeg-9-GtkRadiant.zip',
+ 'libxml2-2.9.1-GtkRadiant.zip',
+ 'gtkglext-1.2.0-3-win32.zip',
+ ]:
+ if ( not os.path.exists( lib_archive ) ):
+ print( 'downloading %s' % lib_archive )
+ archive_web_request = urllib2.urlopen( 'http://gtkradiant.s3-website-us-east-1.amazonaws.com/%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 )
- for file in files:
- shutil.copy( os.path.join( root, file ), os.path.join( target_dir, file ) )
+ archive_web_request.close()
+ archive_File.close()
- def Setup( self ):
- try:
- self.setup_platforms.index( 'local' )
- except:
- pass
- else:
- # special case, fetch external paks under the local install directory
- self.FetchGamePaks( self.install_directory )
- # NOTE: unrelated to self.setup_platforms - grab support files and binaries and install them
- if ( self.platform == 'Windows' ):
- backup_cwd = os.getcwd()
- for lib_archive in [
- 'STLport-5.2.1-GtkRadiant.zip',
- 'gtk-bundle-2.24.10-GtkRadiant.zip',
- 'gtk-bundle-2.22.1-win64-GtkRadiant.zip',
- 'jpeg-9-GtkRadiant.zip',
- 'libxml2-2.9.1-GtkRadiant.zip',
- 'gtkglext-1.2.0-3-win32.zip',
- ]:
- if ( not os.path.exists( lib_archive ) ):
- print( 'downloading %s' % lib_archive )
- archive_web_request = urllib2.urlopen( 'http://gtkradiant.s3-website-us-east-1.amazonaws.com/%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 )
+ print( 'unpacking %s' % lib_archive )
+ lib_archive_path = os.path.abspath( lib_archive )
+ os.chdir( os.path.dirname( backup_cwd ) )
- archive_web_request.close()
- archive_File.close()
+ archive_Zip = zipfile.ZipFile( lib_archive_path, 'r' )
+ archive_Zip.extractall()
+ archive_Zip.close()
- print( 'unpacking %s' % lib_archive )
- lib_archive_path = os.path.abspath( lib_archive )
- os.chdir( os.path.dirname( backup_cwd ) )
+ os.chdir( backup_cwd )
- archive_Zip = zipfile.ZipFile( lib_archive_path, 'r' )
- archive_Zip.extractall()
- archive_Zip.close()
+ # copy all the dependent runtime data to the install directory
+ srcdir = os.path.dirname( backup_cwd )
+ for dll in [
+ '%s/bin/freetype6.dll' % GTK_PREFIX,
+ '%s/bin/intl.dll' % GTK_PREFIX,
+ '%s/bin/libasprintf-0.dll' % GTK_PREFIX,
+ '%s/bin/libatk-1.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libcairo-2.dll' % GTK_PREFIX,
+ '%s/bin/libexpat-1.dll' % GTK_PREFIX,
+ '%s/bin/libfontconfig-1.dll' % GTK_PREFIX,
+ '%s/bin/libgailutil-18.dll' % GTK_PREFIX,
+ '%s/bin/libgcc_s_dw2-1.dll' % GTK_PREFIX,
+ '%s/bin/libgdk-win32-2.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libgdk_pixbuf-2.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libgio-2.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libglib-2.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libgmodule-2.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libgobject-2.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libgthread-2.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libgtk-win32-2.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libpango-1.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libpangocairo-1.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libpangoft2-1.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libpangowin32-1.0-0.dll' % GTK_PREFIX,
+ '%s/bin/libpng14-14.dll' % GTK_PREFIX,
+ '%s/bin/zlib1.dll' % GTK_PREFIX,
+ '%s/lib/GNU.Gettext.dll' % GTK_PREFIX,
+ '%s/lib/gtk-2.0/2.10.0/engines/libpixmap.dll' % GTK_PREFIX,
+ '%s/lib/gtk-2.0/2.10.0/engines/libwimp.dll' % GTK_PREFIX,
+ '%s/lib/gtk-2.0/modules/libgail.dll' % GTK_PREFIX,
+ 'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll',
+ 'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll',
+ ]:
+ shutil.copy( os.path.join( srcdir, dll ), 'install' )
- os.chdir( backup_cwd )
-
- # copy all the dependent runtime data to the install directory
- srcdir = os.path.dirname( backup_cwd )
- for dll in [
- '%s/bin/freetype6.dll' % GTK_PREFIX,
- '%s/bin/intl.dll' % GTK_PREFIX,
- '%s/bin/libasprintf-0.dll' % GTK_PREFIX,
- '%s/bin/libatk-1.0-0.dll' % GTK_PREFIX,
- '%s/bin/libcairo-2.dll' % GTK_PREFIX,
- '%s/bin/libexpat-1.dll' % GTK_PREFIX,
- '%s/bin/libfontconfig-1.dll' % GTK_PREFIX,
- '%s/bin/libgailutil-18.dll' % GTK_PREFIX,
- '%s/bin/libgcc_s_dw2-1.dll' % GTK_PREFIX,
- '%s/bin/libgdk-win32-2.0-0.dll' % GTK_PREFIX,
- '%s/bin/libgdk_pixbuf-2.0-0.dll' % GTK_PREFIX,
- '%s/bin/libgio-2.0-0.dll' % GTK_PREFIX,
- '%s/bin/libglib-2.0-0.dll' % GTK_PREFIX,
- '%s/bin/libgmodule-2.0-0.dll' % GTK_PREFIX,
- '%s/bin/libgobject-2.0-0.dll' % GTK_PREFIX,
- '%s/bin/libgthread-2.0-0.dll' % GTK_PREFIX,
- '%s/bin/libgtk-win32-2.0-0.dll' % GTK_PREFIX,
- '%s/bin/libpango-1.0-0.dll' % GTK_PREFIX,
- '%s/bin/libpangocairo-1.0-0.dll' % GTK_PREFIX,
- '%s/bin/libpangoft2-1.0-0.dll' % GTK_PREFIX,
- '%s/bin/libpangowin32-1.0-0.dll' % GTK_PREFIX,
- '%s/bin/libpng14-14.dll' % GTK_PREFIX,
- '%s/bin/zlib1.dll' % GTK_PREFIX,
- '%s/lib/GNU.Gettext.dll' % GTK_PREFIX,
- '%s/lib/gtk-2.0/2.10.0/engines/libpixmap.dll' % GTK_PREFIX,
- '%s/lib/gtk-2.0/2.10.0/engines/libwimp.dll' % GTK_PREFIX,
- '%s/lib/gtk-2.0/modules/libgail.dll' % GTK_PREFIX,
- 'gtkglext-1.2.0/bin/libgdkglext-win32-1.0-0.dll',
- 'gtkglext-1.2.0/bin/libgtkglext-win32-1.0-0.dll',
- ]:
- shutil.copy( os.path.join( srcdir, dll ), 'install' )
-
- for extra in [
- '%s/etc' % GTK_PREFIX,
- '%s/share' % GTK_PREFIX,
- 'gtkglext-1.2.0/share',
- ]:
- self.CopyTree( os.path.join( srcdir, extra ), 'install' )
-
- try:
- os.mkdir( 'install/x64' )
- except:
- pass # assume 'already exists'
- for x64_dll in [
- '%s/bin/libpng14-14.dll' % GTK64_PREFIX,
- '%s/bin/libglib-2.0-0.dll' % GTK64_PREFIX,
- '%s/bin/libintl-8.dll' % GTK64_PREFIX,
- ]:
- shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' )
+ for extra in [
+ '%s/etc' % GTK_PREFIX,
+ '%s/share' % GTK_PREFIX,
+ 'gtkglext-1.2.0/share',
+ ]:
+ self.CopyTree( os.path.join( srcdir, extra ), 'install' )
+
+ try:
+ os.mkdir( 'install/x64' )
+ except:
+ pass # assume 'already exists'
+ for x64_dll in [
+ '%s/bin/libpng14-14.dll' % GTK64_PREFIX,
+ '%s/bin/libglib-2.0-0.dll' % GTK64_PREFIX,
+ '%s/bin/libintl-8.dll' % GTK64_PREFIX,
+ ]:
+ shutil.copy( os.path.join( srcdir, x64_dll ), 'install/x64' )
def FinishBuild( self, target, source, env ):
- print( 'Lookup and bundle the PNG and JPEG libraries' )
- # radiant.bin doesn't link to jpeg lib directly, grab that from a module
- # Python 2.7 only!
- #module_ldd = subprocess.check_output( 'ldd -r install/modules/image.so', shell = True )
- p = subprocess.Popen( 'ldd -r install/modules/image.so', shell = True, stdout = subprocess.PIPE )
- module_ldd = p.communicate()[0]
+ print( 'Lookup and bundle the PNG and JPEG libraries' )
+ # radiant.bin doesn't link to jpeg lib directly, grab that from a module
+ # Python 2.7 only!
+ #module_ldd = subprocess.check_output( 'ldd -r install/modules/image.so', shell = True )
+ p = subprocess.Popen( 'ldd -r install/modules/image.so', shell = True, stdout = subprocess.PIPE )
+ module_ldd = p.communicate()[0]
# print( module_ldd )
- def find_library( output, libname ):
- match = filter( lambda l : l.find( libname ) != -1, output.split( '\n' ) )[0]
- return re.split( '.*=> (.*) .*', match )[1]
+ def find_library( output, libname ):
+ match = filter( lambda l : l.find( libname ) != -1, output.split( '\n' ) )[0]
+ return re.split( '.*=> (.*) .*', match )[1]
- jpeg_path = find_library( module_ldd, 'libjpeg' )
- print( 'JPEG library: %s' % repr( jpeg_path ) )
- png_path = find_library( module_ldd, 'libpng' )
- print( 'PNG library: %s' % repr( png_path ) )
+ jpeg_path = find_library( module_ldd, 'libjpeg' )
+ print( 'JPEG library: %s' % repr( jpeg_path ) )
+ png_path = find_library( module_ldd, 'libpng' )
+ print( 'PNG library: %s' % repr( png_path ) )
- shutil.copy( jpeg_path, 'install' )
- shutil.copy( png_path, 'install' )
+ shutil.copy( jpeg_path, 'install' )
+ shutil.copy( png_path, '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
class ConfigParser:
- def __init__( self ):
- self.operators = {}
+ def __init__( self ):
+ self.operators = {}
- def _processOp( self, ops ):
- assert( len( ops ) == 1 )
- op = ops.pop()
- if ( op == 'clear' ):
- self.configs = []
- self.current_config = None
- elif ( op == 'pop' ):
- self.configs.pop()
- self.current_config = None
- elif ( op == 'push' ):
- self.configs.append( self.current_config )
- self.current_config = Config()
- self._setupParser( self.current_config )
+ def _processOp( self, ops ):
+ assert( len( ops ) == 1 )
+ op = ops.pop()
+ if ( op == 'clear' ):
+ self.configs = []
+ self.current_config = None
+ elif ( op == 'pop' ):
+ self.configs.pop()
+ self.current_config = None
+ elif ( op == 'push' ):
+ self.configs.append( self.current_config )
+ self.current_config = Config()
+ self._setupParser( self.current_config )
- def _setupParser( self, c ):
- self.operators = { 'op' : self._processOp }
- c.setupParser( self.operators )
+ def _setupParser( self, c ):
+ self.operators = { 'op' : self._processOp }
+ c.setupParser( self.operators )
- def _parseStatement( self, s ):
- statement_re = re.compile( '(.*)=(.*)' )
- value_list_re = re.compile( '([^,]*),?' )
- if ( not statement_re.match( s ) ):
- print 'syntax error (statement match): %s' % repr( s )
- return
- statement_split = statement_re.split( s )
- if ( len( statement_split ) != 4 ):
- print 'syntax error (statement split): %s' % repr( s )
- return
- ( foo, name, value, bar ) = statement_split
- value_split = value_list_re.split( value )
- if ( len( value_split ) < 2 or len( value_split ) % 2 != 1 ):
- print 'syntax error (value split): %s' % ( repr( value_split ) )
- return
- try:
- value_array = []
- value_split.reverse()
- value_split.pop()
- while ( len( value_split ) != 0 ):
- value_array.append( 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
+ def _parseStatement( self, s ):
+ statement_re = re.compile( '(.*)=(.*)' )
+ value_list_re = re.compile( '([^,]*),?' )
+ if ( not statement_re.match( s ) ):
+ print 'syntax error (statement match): %s' % repr( s )
+ return
+ statement_split = statement_re.split( s )
+ if ( len( statement_split ) != 4 ):
+ print 'syntax error (statement split): %s' % repr( s )
+ return
+ ( foo, name, value, bar ) = statement_split
+ value_split = value_list_re.split( value )
+ if ( len( value_split ) < 2 or len( value_split ) % 2 != 1 ):
+ print 'syntax error (value split): %s' % ( repr( value_split ) )
+ return
+ try:
+ value_array = []
+ value_split.reverse()
+ value_split.pop()
+ while ( len( value_split ) != 0 ):
+ value_array.append( 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
- if ( self.configs is None ):
- self.configs = []
- for s in statements:
+ def parseStatements( self, _configs, statements ):
+ self.current_config = None
+ self.configs = _configs
+ if ( self.configs is None ):
+ self.configs = []
+ for s in statements:
- if ( self.current_config is None ):
- # use a provided config, or create a default one
- if ( len( self.configs ) > 0 ):
- self.current_config = self.configs.pop()
- else:
- self.current_config = Config()
- # setup the operator table for this config
- # NOTE: have that in self._processOp too
- self._setupParser( self.current_config )
+ if ( self.current_config is None ):
+ # use a provided config, or create a default one
+ if ( len( self.configs ) > 0 ):
+ self.current_config = self.configs.pop()
+ else:
+ self.current_config = Config()
+ # 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 )
- break
- ( name, value_array ) = ret
- try:
- processor = self.operators[name]
- except:
- print 'unknown operator %s - stop statement parse at %s' % ( repr( name ), repr( s ) )
- break
- processor( value_array )
+ ret = self._parseStatement( s )
+ if ( ret is None ):
+ print 'stop statement parse at %s' % repr( s )
+ break
+ ( name, value_array ) = ret
+ try:
+ processor = self.operators[name]
+ except:
+ print 'unknown operator %s - stop statement parse at %s' % ( repr( name ), repr( s ) )
+ break
+ processor( value_array )
- if ( not self.current_config is None ):
- self.configs.append( self.current_config )
- # make sure there is at least one config
- if ( len( self.configs ) == 0 ):
- print 'pushing a default config'
- self.configs.append( Config() )
- return self.configs
+ if ( not self.current_config is None ):
+ self.configs.append( self.current_config )
+ # make sure there is at least one config
+ if ( len( self.configs ) == 0 ):
+ print 'pushing a default config'
+ self.configs.append( Config() )
+ return self.configs
import unittest
class TestConfigParse( unittest.TestCase ):
- def setUp( self ):
- self.parser = ConfigParser()
+ def setUp( self ):
+ self.parser = ConfigParser()
- def testBasicParse( self ):
- # test basic config parsing
- # needs to cleanly stop at the first config statement that is not recognized
- configs = self.parser.parseStatements( None, [ 'game=missionpack', 'config=qvm', 'foobar' ] )
- print repr( configs )
+ def testBasicParse( self ):
+ # test basic config parsing
+ # needs to cleanly stop at the first config statement that is not recognized
+ configs = self.parser.parseStatements( None, [ 'game=missionpack', 'config=qvm', 'foobar' ] )
+ print repr( configs )
- def testMultiParse( self ):
- # multiple configs seperated by commas
- configs = self.parser.parseStatements( None, [ 'target=server,game,cgame' ] )
- print repr( configs )
+ def testMultiParse( self ):
+ # multiple configs seperated by commas
+ configs = self.parser.parseStatements( None, [ 'target=server,game,cgame' ] )
+ print repr( configs )
- def testOp( self ):
- # test the operator for multiple configs
- configs = self.parser.parseStatements( None, [ 'target=core', 'config=release', 'op=push', 'target=game,cgame,ui', 'config=debug' ] )
- print repr( configs )
+ def testOp( self ):
+ # test the operator for multiple configs
+ configs = self.parser.parseStatements( None, [ 'target=core', 'config=release', 'op=push', 'target=game,cgame,ui', 'config=debug' ] )
+ print repr( configs )
if __name__ == '__main__':
- unittest.main()
+ unittest.main()
\ No newline at end of file
diff --git a/radiant/main.cpp b/radiant/main.cpp
index 5ba7b518..d41b77e1 100644
--- a/radiant/main.cpp
+++ b/radiant/main.cpp
@@ -463,19 +463,17 @@ int main( int argc, char* argv[] ) {
*/
putenv( "LC_NUMERIC=C" );
-#ifdef _WIN32
- libgl = "opengl32.dll";
-#endif
-
-#if defined ( __linux__ )
- libgl = "libGL.so.1";
-#endif
-
-#ifdef __APPLE__
- // libgl = "/usr/X11R6/lib/libGL.dylib";
- // libgl = "/usr/X11/lib/libGL.dylib";
- libgl = "/opt/local/lib/libGL.dylib";
-#endif
+ // Use the same environment variable for resolving libGL as libgtkglext does.
+ libgl = getenv("GDK_GL_LIBGL_PATH");
+ if ( libgl == NULL ) {
+ #if defined ( _WIN32 )
+ libgl = "opengl32.dll";
+ #elif defined ( __linux__ )
+ libgl = "libGL.so.1";
+ #elif defined ( __APPLE__ )
+ libgl = "/opt/local/lib/libGL.dylib";
+ #endif
+ }
#if defined ( __linux__ ) || defined ( __APPLE__ )
// Give away unnecessary root privileges.
diff --git a/radiant/preferences.cpp b/radiant/preferences.cpp
index 2cd2210f..c1191ec8 100644
--- a/radiant/preferences.cpp
+++ b/radiant/preferences.cpp
@@ -662,7 +662,9 @@ PrefsDlg::PrefsDlg (){
#endif
m_nLightRadiuses = 1;
m_bQ3Map2Texturing = TRUE;
- m_bx64q3map2 = TRUE;
+#ifdef _WIN32
+ m_bx64q3map2 = TRUE;
+#endif
#ifdef ATIHACK_812
m_bGlATIHack = FALSE;
#endif
@@ -3144,7 +3146,9 @@ void PrefsDlg::LoadPrefs(){
mLocalPrefs.GetPref( LIGHTRADIUS_KEY, &m_nLightRadiuses, TRUE );
mLocalPrefs.GetPref( Q3MAP2TEX_KEY, &m_bQ3Map2Texturing, TRUE );
- mLocalPrefs.GetPref( X64Q3MAP2_KEY, &m_bx64q3map2, TRUE );
+#ifdef _WIN32
+ mLocalPrefs.GetPref( X64Q3MAP2_KEY, &m_bx64q3map2, TRUE );
+#endif
#ifdef ATIHACK_812
mLocalPrefs.GetPref( ATIHACK_KEY, &m_bGlATIHack, FALSE );
diff --git a/radiant/qe3.cpp b/radiant/qe3.cpp
index e22ad01c..f5f962ac 100644
--- a/radiant/qe3.cpp
+++ b/radiant/qe3.cpp
@@ -443,7 +443,7 @@ void ReplaceTemplates( char* w, const char* r ){
const char *__TOOLSPATH = "TEMPLATEtoolspath";
const char *__BASEDIR = "TEMPLATEbasedir";
const char *__APPPATH = "TEMPLATEapppath";
- const char *__Q3MAP2 = "TEMPLATEq3map2";
+ const char *__Q3MAP2 = "TEMPLATEq3map2";
// iterate through string r
while ( *r != '\0' )
@@ -471,13 +471,16 @@ void ReplaceTemplates( char* w, const char* r ){
p = g_strAppPath.GetBuffer();
}
else if ( strncmp( r + 1, __Q3MAP2, strlen( __Q3MAP2 ) ) == 0 ) {
- r += strlen( __Q3MAP2 ) + 1;
- // see https://github.com/TTimo/GtkRadiant/issues/116
- if ( g_PrefsDlg.m_bx64q3map2 ) {
+ r += strlen( __Q3MAP2 ) + 1;
+ // see https://github.com/TTimo/GtkRadiant/issues/116
+#ifdef _WIN32
+ if ( g_PrefsDlg.m_bx64q3map2 ) {
p = "x64/q3map2";
- } else {
- p = "q3map2";
- }
+ } else
+#endif
+ {
+ p = "q3map2";
+ }
}
else
{
diff --git a/radiant/qgl.c b/radiant/qgl.c
index cf42a3b6..881e616e 100644
--- a/radiant/qgl.c
+++ b/radiant/qgl.c
@@ -1717,11 +1717,9 @@ int GL_ExtensionSupported( const char *extension ){
}
extensions = qglGetString( GL_EXTENSIONS );
-#ifndef __APPLE__
if ( !extensions ) {
return 0;
}
-#endif
// It takes a bit of care to be fool-proof about parsing the
// OpenGL extensions string. Don't be fooled by sub-strings, etc.