kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
freebsd-ports/games/gtkradiant/files/patch-SConstruct

86 lines
2.6 KiB
Text
Raw Normal View History

GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
--- SConstruct.orig Fri Feb 10 19:01:20 2006
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
+++ SConstruct Tue May 30 22:35:47 2006
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
@@ -3,7 +3,6 @@
import commands, re, sys, os, pickle, string, popen2
from makeversion import radiant_makeversion, get_version
-from osx_setup import do_osx_setup
# to access some internal stuff
import SCons
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
@@ -11,7 +10,7 @@
conf_filename='site.conf'
# there is a default hardcoded value, you can override on command line, those are saved between runs
# we only handle strings
-serialized=['CC', 'CXX', 'JOBS', 'BUILD', 'SETUP']
+serialized=['CC', 'CXX', 'CCFLAGS', 'CXXFLAGS', 'LINKFLAGS', 'PTHREAD_LIBS', 'LOCALBASE', 'X11BASE', 'JOBS', 'BUILD', 'SETUP']
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
# help -------------------------------------------
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
@@ -64,14 +63,7 @@
# TODO: detect Darwin / OSX
# CPU type
-g_cpu = commands.getoutput('uname -m')
-exp = re.compile('.*i?86.*')
-if (g_cpu == 'Power Macintosh' or g_cpu == 'ppc'):
- g_cpu = 'ppc'
-elif exp.match(g_cpu):
- g_cpu = 'x86'
-else:
- g_cpu = 'cpu'
+g_cpu = 'cpu'
# OS
OS = commands.getoutput('uname')
@@ -172,8 +164,8 @@
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
# common flags
warningFlags = '-W -Wall -Wcast-align -Wcast-qual -Wno-unused-parameter '
warningFlagsCXX = '-Wno-non-virtual-dtor -Wreorder ' # -Wold-style-cast
-CCFLAGS = '' + warningFlags
-CXXFLAGS = '-pipe -DQ_NO_STLPORT ' + warningFlags + warningFlagsCXX
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
+CCFLAGS += ' '
+CXXFLAGS += ' -pipe -DQ_NO_STLPORT '
CPPPATH = []
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
if (BUILD == 'debug'):
CXXFLAGS += '-g -D_DEBUG '
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
@@ -190,7 +182,6 @@
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
print 'Unknown build configuration ' + BUILD
sys.exit( 0 )
-LINKFLAGS = ''
if ( OS == 'Linux' ):
# static
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
@@ -218,6 +209,12 @@
CPPPATH.append('/sw/include')
CPPPATH.append('/usr/X11R6/include')
LINKFLAGS += '-L/sw/lib -L/usr/lib -L/usr/X11R6/lib '
+elif ( OS == 'FreeBSD' ):
+ CCFLAGS += '-fPIC '
+ CXXFLAGS += '-fPIC '
+ CPPPATH.append(LOCALBASE + '/include')
+ CPPPATH.append(X11BASE + '/include')
+ LINKFLAGS += '-L' + LOCALBASE + '/lib ' + '-L' + X11BASE + '/lib '
CPPPATH.append('libs')
@@ -269,6 +266,8 @@
def usePThread(self):
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
if ( OS == 'Darwin' ):
self['LINKFLAGS'] += '-lpthread -Wl,-stack_size,0x400000 '
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
+ elif ( OS == 'FreeBSD' ):
+ self['LINKFLAGS'] += PTHREAD_LIBS
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
else:
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
self['LINKFLAGS'] += '-lpthread '
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
- Fix building on non-i386 architectures. - Avoid hacking the SConstruct file, pass information through the environment.
2006-05-31 03:51:05 +02:00
@@ -278,7 +277,7 @@
GtkRadiant is a level design program developed by id Software and Loki Software. It is used to create maps for a number of computer games. GtkRadiant originated as Q3Radiant, the Quake III Arena level design tool, which was a Windows-only application. Two major things are different in GtkRadiant: it is based on the GTK+ toolkit, so it also works in Linux and Mac OS X, and it's also game engine-independent, with functionality for new games added as game packs. GtkRadiant is an Open Source application. Source code is publicly available from id Software's Subversion repository and new additions to the code are covered under open source licenses. The core Q3Radiant code, however, was originally under id Software's proprietary license. The license for both the editor and toolset (notably Q3Map2, the BSP compiler) was changed in February 2006, and publicly released under the GPL on February 17. WWW: http://www.qeradiant.com/ PR: ports/93668 Submitted by: Alejandro Pulver <alejandro@varnet.biz> Approved by: garga (mentor)
2006-05-10 20:35:19 +02:00
print('ERROR: CheckLDD: target %s not found\n' % target[0])
Exit(1)
# not using os.popen3 as I want to check the return code
- ldd = popen2.Popen3('`which ldd` -r %s' % target[0], 1)
+ ldd = popen2.Popen3('`which ldd` %s' % target[0], 1)
stdout_lines = ldd.fromchild.readlines()
stderr_lines = ldd.childerr.readlines()
ldd_ret = ldd.wait()
Reference in a new issue Copy permalink