diff --git a/SConstruct b/SConstruct
index c963934a0..e368d5762 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1898,11 +1898,10 @@ 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 : exe_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)
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 @@
+
+
+
+
+ CFBundleDevelopmentRegion
+ English
+ CFBundleExecutable
+ %BUNDLE_EXECUTABLE%
+ CFBundleIconFile
+ %ICONFILE%
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundlePackageType
+ APPL
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ %LONGVERSION%
+ CFBundleShortVersionString
+ %SHORTVERSION%
+ CSResourcesFileMapped
+
+ LSPrefersCarbon
+
+ NSMainNibFile
+ MainMenu
+ NSPrincipalClass
+ NSApplication
+
+
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
#include "varutil.h"
#include "window.h"