2d9aecd94c
- Fix build on 9.x PR: 142753 Submitted by: Hardy Schumacher <hardy.schumacher _at_ gmx.de> [1]
50 lines
2.2 KiB
Text
50 lines
2.2 KiB
Text
--- SConstruct.orig 2007-06-11 14:29:13.000000000 -0400
|
|
+++ SConstruct 2007-12-20 20:52:35.000000000 -0500
|
|
@@ -62,7 +62,7 @@
|
|
if (debug == 1):
|
|
env.Append(CCFLAGS = '-g')
|
|
env.Append(CPPDEFINES = ['DEBUG'])
|
|
-elif (sys.platform == 'freebsd5') or (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7'):
|
|
+elif (sys.platform == 'freebsd6') or (sys.platform == 'freebsd7') or (sys.platform == 'freebsd8') or (sys.platform == 'freebsd9'):
|
|
print "Compiling for FreeBSD Environment"
|
|
env = Environment(ENV = os.environ)
|
|
LOCALBASE = os.environ['LOCALBASE']
|
|
@@ -70,7 +70,7 @@
|
|
SDL_CONFIG = os.environ['SDL_CONFIG']
|
|
env.Replace(CC = os.environ['CC'])
|
|
env.Replace(CXX = os.environ['CXX'])
|
|
- env.Append(CPPPATH = [LOCALBASE + '/include', LOCALBASE + '/include/SDL11', X11BASE + '/include', X11BASE + '/include/GL'])
|
|
+ env.Append(CPPPATH = [LOCALBASE + '/include', LOCALBASE + '/include/SDL', X11BASE + '/include', X11BASE + '/include/GL'])
|
|
libpath = [LOCALBASE + '/lib', X11BASE + '/lib']
|
|
gllibs = ['GL', 'GLU']
|
|
sdllibs = ['SDL_image']
|
|
@@ -79,7 +79,7 @@
|
|
cpuinfol = cpuinfof.readlines()
|
|
mmxsupported = False
|
|
ssesupported = False
|
|
- for i in cpuinfol:
|
|
+ for i in cpuinfol:
|
|
if i == '1\n':
|
|
mmxsupported = True
|
|
ssesupported = True
|
|
@@ -91,14 +91,15 @@
|
|
osspecificsrc += []
|
|
print 'Using x86 SSE/MMX optimizations.'
|
|
|
|
- env.Replace(CCFLAGS = os.environ['CFLAGS'])
|
|
+ env.Replace(CCFLAGS = os.environ['CFLAGS'])
|
|
if (debug == 1):
|
|
env.Append(CCFLAGS = '-g')
|
|
env.Append(CPPDEFINES = ['DEBUG'])
|
|
- env.Replace(CXXFLAGS = os.environ['CXXFLAGS'] + ' `' + SDL_CONFIG + ' --cflags`')
|
|
- env.Append(LINKFLAGS = '`' + SDL_CONFIG + ' --libs`')
|
|
- datadir = '/usr/local/share/dangerdeep'
|
|
- build_dir = 'freebsd'
|
|
+ env.Replace(CXXFLAGS = os.environ['CXXFLAGS'] + ' `' + SDL_CONFIG + ' --cflags`')
|
|
+ env.Append(LINKFLAGS = '`' + SDL_CONFIG + ' --libs`')
|
|
+ env.Append(LIBPATH = [LOCALBASE + '/lib', X11BASE + '/lib'])
|
|
+ datadir = '/usr/local/share/dangerdeep'
|
|
+ build_dir = 'freebsd'
|
|
|
|
if (os.system('grep glBindProgram ' + X11BASE + '/include/GL/gl*.h > /dev/null') == 0):
|
|
gllibdirs = [X11BASE + '/lib/', '/usr/lib/', LOCALBASE + '/lib/']
|