From 3cffacb9b205fe1aad4cb100d8f24cba8ddddb4a Mon Sep 17 00:00:00 2001
From: Chris Taylor <chris@icculus.org>
Date: Fri, 5 Apr 2013 09:25:10 +0800
Subject: [PATCH] Changes towards building using SCons on Mac OS X

---
 CHANGELOG.txt |  1 +
 SConstruct    | 33 +++++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 893b623ca..9bed96c9e 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -3,6 +3,7 @@ D1X-Rebirth Changelog
 20130405
 --------
 SConstruct: For the assembler build, make sure platform_settings is accessed from self, likely preventing a compiling error
+SConstruct: Changes towards building using SCons on Mac OS X
 
 20130117
 --------
diff --git a/SConstruct b/SConstruct
index f90964505..126a4f127 100644
--- a/SConstruct
+++ b/SConstruct
@@ -72,25 +72,21 @@ class DXXProgram:
 			env.Append(CPPPATH = [os.path.join(self.srcdir, 'arch/win32/include')])
 			self.platform_sources = [os.path.join(program.srcdir, 'arch/win32/messagebox.c')]
 	# Settings to apply to Apple builds
-	# This appears to be unused.  The reference to sdl_only fails to
-	# execute.
 	class DarwinPlatformSettings(_PlatformSettings):
 		def __init__(self,user_settings):
 			DXXProgram._PlatformSettings.__init__(self)
 			self.osdef = '__APPLE__'
-			if (user_settings.sdlmixer == 1):
-				print "including SDL_mixer"
-				platform_settings.lflags += ' -framework SDL_mixer'
 			user_settings.sharepath = ''
 			user_settings.asm = 0
-			# Ugly way of linking to frameworks, but kreator has seen uglier
-			self.lflags = '-framework ApplicationServices -framework Carbon -framework Cocoa -framework SDL'
-			if (sdl_only == 0):
-				self.lflags += ' -framework OpenGL'
-			self.libs = ['../physfs/build/Debug/libphysfs.dylib']
+			self.lflags = os.environ["LDFLAGS"] if os.environ.has_key('LDFLAGS') else ''
 		def adjust_environment(self,program,env):
 			env.Append(CPPDEFINES = ['__unix__'])
+			env.Append(CPPPATH = [os.path.join(program.srcdir, '../physfs'), os.path.join(os.getenv("HOME"), 'Library/Frameworks/SDL.framework/Headers'), '/Library/Frameworks/SDL.framework/Headers'])
 			self.platform_sources = [os.path.join(program.srcdir, f) for f in ['arch/cocoa/SDLMain.m', 'arch/carbon/messagebox.c']]
+			env.Append(FRAMEWORKS = ['ApplicationServices', 'Carbon', 'Cocoa', 'SDL'])
+			# Look in frameworks for header files
+			env.Append(CPPFLAGS = ['-F' + os.path.join(os.getenv("HOME"), 'Library/Frameworks')])
+			self.libs = ['../physfs/build/Debug/libphysfs.dylib']
 	# Settings to apply to Linux builds
 	class LinuxPlatformSettings(_PlatformSettings):
 		def __init__(self,user_settings):
@@ -160,13 +156,11 @@ class DXXProgram:
 		elif sys.platform == 'darwin':
 			print "%s: compiling on Mac OS X" % self.PROGRAM_NAME
 			platform = self.DarwinPlatformSettings
-			sys.path += ['./arch/cocoa']
-			VERSION = str(VERSION_MAJOR) + '.' + str(VERSION_MINOR)
-			if (VERSION_MICRO):
-				VERSION += '.' + str(VERSION_MICRO)
+			VERSION = str(self.VERSION_MAJOR) + '.' + str(self.VERSION_MINOR)
+			if (self.VERSION_MICRO):
+				VERSION += '.' + str(self.VERSION_MICRO)
 			env['VERSION_NUM'] = VERSION
 			env['VERSION_NAME'] = self.PROGRAM_NAME + ' v' + VERSION
-			import tool_bundle
 		else:
 			print "%s: compiling on *NIX" % self.PROGRAM_NAME
 			platform = self.LinuxPlatformSettings
@@ -187,7 +181,10 @@ class DXXProgram:
 				print "%s: building with OpenGL" % self.PROGRAM_NAME
 			env.Append(CPPDEFINES = ['OGL'])
 			self.common_sources += self.arch_ogl_sources
-			self.platform_settings.libs += self.platform_settings.ogllibs
+			if (sys.platform != 'darwin'):
+				self.platform_settings.libs += self.platform_settings.ogllibs
+			else:
+				env.Append(FRAMEWORKS = ['OpenGL'])
 		else:
 			print "%s: building with Software Renderer" % self.PROGRAM_NAME
 			self.common_sources += self.arch_sdl_sources
@@ -208,6 +205,8 @@ class DXXProgram:
 			self.common_sources += self.arch_sdlmixer
 			if (sys.platform != 'darwin'):
 				self.platform_settings.libs += ['SDL_mixer']
+			else:
+				env.Append(FRAMEWORKS = ['SDL_mixer'])
 
 		# debug?
 		if (self.user_settings.debug == 1):
@@ -490,6 +489,8 @@ class D1XProgram(DXXProgram):
 			env.Install(self.user_settings.BIN_DIR, str(exe_target))
 			env.Alias('install', self.user_settings.BIN_DIR)
 		else:
+			sys.path += ['./arch/cocoa']
+			import tool_bundle
 			tool_bundle.TOOL_BUNDLE(env)
 			env.MakeBundle(self.PROGRAM_NAME + '.app', exe_target,
 					'free.d1x-rebirth', 'd1xgl-Info.plist',