From 6cf4e861851b368def2d8a6f7541ea41d0c69fdc Mon Sep 17 00:00:00 2001
From: Bradley Bell <bradley.bell@gmail.com>
Date: Thu, 4 Dec 2014 15:58:50 -0800
Subject: [PATCH 1/4] use correct path for bundle executable

---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index 3f1e588dc..cb1c084b3 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1893,7 +1893,7 @@ class DXXProgram(DXXCommon):
 					'free.%s-rebirth' % dxxstr, os.path.join(self.srcdir, '%sgl-Info.plist' % dxxstr),
 					typecode='APPL', creator='DCNT',
 					icon_file=os.path.join(cocoa, '%s-rebirth.icns' % dxxstr),
-					subst_dict={'%sgl' % dxxstr : exe_target},	# This is required; manually update version for Xcode compatibility
+					subst_dict={'%sgl' % dxxstr : self.target},	# This is required; manually update version for Xcode compatibility
 					resources=[[s, s] for s in [os.path.join(self.srcdir, 'English.lproj/InfoPlist.strings')]])
 
 	def GenerateHelpText(self):

From 876c4522b377447258174333ca5b81f62b5fe935 Mon Sep 17 00:00:00 2001
From: Bradley Bell <bradley.bell@gmail.com>
Date: Thu, 4 Dec 2014 16:39:45 -0800
Subject: [PATCH 2/4] use correct path for localized strings

---
 SConstruct | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index cb1c084b3..9c527791c 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1894,7 +1894,7 @@ class DXXProgram(DXXCommon):
 					typecode='APPL', creator='DCNT',
 					icon_file=os.path.join(cocoa, '%s-rebirth.icns' % dxxstr),
 					subst_dict={'%sgl' % dxxstr : self.target},	# This is required; manually update version for Xcode compatibility
-					resources=[[s, s] for s in [os.path.join(self.srcdir, 'English.lproj/InfoPlist.strings')]])
+					resources=[[os.path.join(self.srcdir, s), s] for s in ['English.lproj/InfoPlist.strings']])
 
 	def GenerateHelpText(self):
 		return self.variables.GenerateHelpText(self.env)

From 0cc88280ba55cc1b4b57776e6c8c1b2b75361778 Mon Sep 17 00:00:00 2001
From: Bradley Bell <bradley.bell@gmail.com>
Date: Thu, 4 Dec 2014 17:27:06 -0800
Subject: [PATCH 3/4] Simplify by using generic Info.plist, builtin substitions

---
 SConstruct                   |  3 +--
 common/arch/cocoa/Info.plist | 30 ++++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 common/arch/cocoa/Info.plist

diff --git a/SConstruct b/SConstruct
index 9c527791c..328f60816 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1890,10 +1890,9 @@ class DXXProgram(DXXCommon):
 			sys.path = syspath
 			tool_bundle.TOOL_BUNDLE(env)
 			env.MakeBundle(os.path.join(self.user_settings.builddir, self.PROGRAM_NAME + '.app'), exe_node,
-					'free.%s-rebirth' % dxxstr, os.path.join(self.srcdir, '%sgl-Info.plist' % dxxstr),
+					'free.%s-rebirth' % dxxstr, os.path.join(cocoa, 'Info.plist'),
 					typecode='APPL', creator='DCNT',
 					icon_file=os.path.join(cocoa, '%s-rebirth.icns' % dxxstr),
-					subst_dict={'%sgl' % dxxstr : self.target},	# This is required; manually update version for Xcode compatibility
 					resources=[[os.path.join(self.srcdir, s), s] for s in ['English.lproj/InfoPlist.strings']])
 
 	def GenerateHelpText(self):
diff --git a/common/arch/cocoa/Info.plist b/common/arch/cocoa/Info.plist
new file mode 100644
index 000000000..5be0c2861
--- /dev/null
+++ b/common/arch/cocoa/Info.plist
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>%BUNDLE_EXECUTABLE%</string>
+	<key>CFBundleIconFile</key>
+	<string>%ICONFILE%</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>%LONGVERSION%</string>
+	<key>CFBundleShortVersionString</key>
+	<string>%SHORTVERSION%</string>
+	<key>CSResourcesFileMapped</key>
+	<false/>
+	<key>LSPrefersCarbon</key>
+	<true/>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>

From fdf70b017e1562e67110ce3b08881114825ee4e9 Mon Sep 17 00:00:00 2001
From: Bradley Bell <bradley.bell@gmail.com>
Date: Thu, 4 Dec 2014 18:09:05 -0800
Subject: [PATCH 4/4] <string> required for std::string

---
 common/include/ui.h | 1 +
 1 file changed, 1 insertion(+)

diff --git a/common/include/ui.h b/common/include/ui.h
index d09b30481..d204b2b4a 100644
--- a/common/include/ui.h
+++ b/common/include/ui.h
@@ -32,6 +32,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
 #include "u_mem.h"
 
 #ifdef __cplusplus
+#include <string>
 #include "varutil.h"
 #include "window.h"