Changeset - r6300:8d88154d6539
[Not reviewed]
master
0 2 0
rubidium - 18 years ago 2007-03-12 15:54:19
rubidium@openttd.org
(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.
2 files changed with 6 insertions and 6 deletions:
0 comments (0 inline, 0 general)
Makefile.in
Show inline comments
 
@@ -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
config.lib
Show inline comments
 
@@ -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=""
0 comments (0 inline, 0 general)