summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2007-03-12 15:54:19 +0000
committerrubidium <rubidium@openttd.org>2007-03-12 15:54:19 +0000
commitf19dc97e1a01214cd63f93aba228f1903d9c196e (patch)
tree939d3e34835321a9f4a7a9b106a4336cfff4e1d0
parent1926b9038d6d702a9774ae76bf7a342d0e0bf877 (diff)
downloadopenttd-f19dc97e1a01214cd63f93aba228f1903d9c196e.tar.xz
(svn r9131) -Codechange: move the OSX application bundle resource directories so they comply (better) to Apple's guidelines and to our naming 'scheme' for the lang and data directories.
-rw-r--r--Makefile.in4
-rw-r--r--config.lib8
2 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index 0b9a48788..66eac2c12 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -133,8 +133,8 @@ endif
# An OSX application bundle needs the data files, lang files and openttd executable in a different location.
ifdef OSXAPP
-DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Data
-LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Lang
+DATA_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/data
+LANG_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/lang
TTD_DIR = $(BUNDLE_DIR)/$(OSXAPP)/Contents/MacOS
else
DATA_DIR = $(BUNDLE_DIR)/data
diff --git a/config.lib b/config.lib
index d5ba6f4e4..6d509a5a9 100644
--- a/config.lib
+++ b/config.lib
@@ -555,18 +555,18 @@ check_params() {
OSXAPP="OpenTTD.app"
# TODO: remove next few lines of code when the search path patch has been applied
- if [ -n "$custom_lang_dir" ] && [ "$custom_lang_dir" != "${OSXAPP}/Contents/Lang/" ]; then
+ if [ -n "$custom_lang_dir" ] && [ "$custom_lang_dir" != "${OSXAPP}/Contents/Resources/lang/" ]; then
log 1 "configure: error: --custom-lang-dir and --with-application-bundle are not compatible
exit 1
fi
- if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "${OSXAPP}/Contents/Data/" ]; then
+ if [ -n "$custom_lang_dir" ] && [ "$second_data_dir" != "${OSXAPP}/Contents/Resources/data/" ]; then
log 1 "configure: error: --second-data-dir and --with-application-bundle are not compatible
exit 1
fi
- custom_lang_dir="${OSXAPP}/Contents/Lang/"
- second_data_dir="${OSXAPP}/Contents/Data/"
+ custom_lang_dir="${OSXAPP}/Contents/Resources/lang/"
+ second_data_dir="${OSXAPP}/Contents/Resources/data/"
# TODO: remove till here
else
OSXAPP=""