Mercurial > hg > openttd
changeset 6300:c85cf5d3d0f0 draft
(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.
| author | rubidium <rubidium@openttd.org> |
|---|---|
| date | Mon, 12 Mar 2007 15:54:19 +0000 |
| parents | b77652d15a0a |
| children | 0df33ca10023 |
| files | Makefile.in config.lib |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.in +++ b/Makefile.in @@ -133,8 +133,8 @@ # 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
--- a/config.lib +++ b/config.lib @@ -555,18 +555,18 @@ 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=""