summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2005-07-29 09:45:25 +0000
committerbjarni <bjarni@openttd.org>2005-07-29 09:45:25 +0000
commit30a5f299f8a54ca8dffeb31c41de0b474ecc7aed (patch)
treee8c04b322d808aabc55aa97dc2999e111e28df6f
parent79292d193edeb2c8a34fdb93d12e176c9e7e51d8 (diff)
downloadopenttd-30a5f299f8a54ca8dffeb31c41de0b474ecc7aed.tar.xz
(svn r2745) -Fix: [OSX] removed the assert window introduced in 2741 from strgen
- it appeared to cause problems and strgen don't need a GUI - renamed ottd to openttd in the app menu (Tobin)
-rwxr-xr-xos/macosx/plistgen.sh2
-rw-r--r--stdafx.h3
2 files changed, 3 insertions, 2 deletions
diff --git a/os/macosx/plistgen.sh b/os/macosx/plistgen.sh
index 237901eb8..51059d331 100755
--- a/os/macosx/plistgen.sh
+++ b/os/macosx/plistgen.sh
@@ -31,7 +31,7 @@ echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
- <string>ottd</string>
+ <string>OpenTTD</string>
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
diff --git a/stdafx.h b/stdafx.h
index da8f1e88b..b085d18f8 100644
--- a/stdafx.h
+++ b/stdafx.h
@@ -24,7 +24,8 @@
#include <stdlib.h>
// MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal
-#if !defined(__APPLE__)
+// strgen always runs from terminal and don't need a window for asserts
+#if !defined(__APPLE__) || defined(STRGEN)
#include <assert.h>
#else
#include "os/macosx/macos.h"