diff options
| -rw-r--r-- | Makefile | 20 | ||||
| -rw-r--r-- | misc_gui.c | 2 | ||||
| -rw-r--r-- | os/macosx/Open_Transport_Tycoon_Forum.webloc (renamed from os/macos/Open_Transport_Tycoon_Forum.webloc) | 0 | ||||
| -rw-r--r-- | os/macosx/Open_Transport_Tycoon_Homepage.webloc (renamed from os/macos/Open_Transport_Tycoon_Homepage.webloc) | 0 | ||||
| -rw-r--r-- | os/macosx/SourceForge_OpenTTD_project_homepage.webloc (renamed from os/macos/SourceForge_OpenTTD_project_homepage.webloc) | 0 | ||||
| -rw-r--r-- | os/macosx/openttd.icns (renamed from os/macos/openttd.icns) | bin | 49800 -> 49800 bytes | |||
| -rw-r--r-- | os/macosx/openttdmidi.java (renamed from os/macos/openttdmidi.java) | 0 | ||||
| -rwxr-xr-x | os/macosx/plistgen.sh (renamed from os/macos/plistgen.sh) | 0 | ||||
| -rwxr-xr-x | os/macosx/track_starter (renamed from os/macos/track_starter) | 0 | ||||
| -rw-r--r-- | readme.txt | 2 |
10 files changed, 12 insertions, 12 deletions
@@ -496,7 +496,7 @@ endif # MIDI setup ifdef OSX ifndef MIDI -MIDI:=$(OSXAPP)/contents/macos/track_starter +MIDI:=$(OSXAPP)/contents/macosx/track_starter endif ifndef SECOND_DATA_PATH SECOND_DATA_PATH:="$(OSXAPP)/contents/data/" @@ -774,7 +774,7 @@ quiet_cmd_cxx_compile = '===> Compiling $<' ifdef OSX OSX:=OSX -OSX_MIDI_PLAYER_FILE:=os/macos/OpenTTDMidi.class +OSX_MIDI_PLAYER_FILE:=os/macosx/OpenTTDMidi.class endif @@ -798,12 +798,12 @@ $(OSX): $(TTD) $(Q)mkdir -p "$(OSXAPP)"/Contents/Data $(Q)mkdir -p "$(OSXAPP)"/Contents/Lang $(Q)echo "APPL????" > "$(OSXAPP)"/Contents/PkgInfo - $(Q)cp os/macos/openttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns - $(Q)os/macos/plistgen.sh "$(OSXAPP)" "$(REV)" - $(Q)cp os/macos/track_starter "$(OSXAPP)"/contents/macos - $(Q)ls os/macos | grep -q "\.class" || \ - javac os/macos/OpenTTDMidi.java - $(Q)cp os/macos/OpenTTDMidi.class "$(OSXAPP)"/contents/macos + $(Q)cp os/macosx/openttd.icns "$(OSXAPP)"/Contents/Resources/openttd.icns + $(Q)os/macosx/plistgen.sh "$(OSXAPP)" "$(REV)" + $(Q)cp os/macosx/track_starter "$(OSXAPP)"/contents/macos + $(Q)ls os/macosx | grep -q "\.class" || \ + javac os/macosx/OpenTTDMidi.java + $(Q)cp os/macosx/OpenTTDMidi.class "$(OSXAPP)"/contents/macos $(Q)cp data/* "$(OSXAPP)"/Contents/data/ $(Q)cp lang/*.lng "$(OSXAPP)"/Contents/lang/ $(Q)cp $(TTD) "$(OSXAPP)"/Contents/MacOS/$(TTD) @@ -877,7 +877,7 @@ release: all $(Q)cp COPYING "OpenTTD $(RELEASE)"/docs/ $(Q)cp changelog.txt "OpenTTD $(RELEASE)"/docs/ $(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD $(RELEASE)"/docs/ - $(Q)cp os/macos/*.webloc "OpenTTD $(RELEASE)" + $(Q)cp os/macosx/*.webloc "OpenTTD $(RELEASE)" $(Q)cp known-bugs.txt "OpenTTD $(RELEASE)"/known-bugs.txt $(Q)cp scenario/* "OpenTTD $(RELEASE)"/scenario/ $(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD $(RELEASE)" openttd-"$(RELEASE)"-osx.dmg @@ -894,7 +894,7 @@ nightly_build: all $(Q)cp COPYING "OpenTTD_nightly_$(DATE)"/docs/ $(Q)cp revisionlog.txt "OpenTTD_nightly_$(DATE)"/revisionlog.txt $(Q)cp docs/README_if_game_crashed_on_OSX.txt "OpenTTD_nightly_$(DATE)"/docs/ - $(Q)cp os/macos/*.webloc "OpenTTD_nightly_$(DATE)"/ + $(Q)cp os/macosx/*.webloc "OpenTTD_nightly_$(DATE)"/ $(Q)/usr/bin/hdiutil create -ov -format UDZO -srcfolder "OpenTTD_nightly_$(DATE)" openttd-nightly-"$(DATE)".dmg $(Q)rm -fr "OpenTTD_nightly_$(DATE)" diff --git a/misc_gui.c b/misc_gui.c index 0860246f8..887e26e3c 100644 --- a/misc_gui.c +++ b/misc_gui.c @@ -175,7 +175,7 @@ static const char *credits[] = { "Original graphics by Simon Foster", "", "The OpenTTD team (in alphabetical order):", - " Bjarni Corfitzen (Bjarni) - MacOS port", + " Bjarni Corfitzen (Bjarni) - MacOSX port, coder", " Victor Fischer (Celestar) - Programming everywhere you need him to", " Tamas Faragó (Darkvater) - Lead coder", " Dominik Scherer (dominik81) - Lead coder", diff --git a/os/macos/Open_Transport_Tycoon_Forum.webloc b/os/macosx/Open_Transport_Tycoon_Forum.webloc index e69de29bb..e69de29bb 100644 --- a/os/macos/Open_Transport_Tycoon_Forum.webloc +++ b/os/macosx/Open_Transport_Tycoon_Forum.webloc diff --git a/os/macos/Open_Transport_Tycoon_Homepage.webloc b/os/macosx/Open_Transport_Tycoon_Homepage.webloc index e69de29bb..e69de29bb 100644 --- a/os/macos/Open_Transport_Tycoon_Homepage.webloc +++ b/os/macosx/Open_Transport_Tycoon_Homepage.webloc diff --git a/os/macos/SourceForge_OpenTTD_project_homepage.webloc b/os/macosx/SourceForge_OpenTTD_project_homepage.webloc index e69de29bb..e69de29bb 100644 --- a/os/macos/SourceForge_OpenTTD_project_homepage.webloc +++ b/os/macosx/SourceForge_OpenTTD_project_homepage.webloc diff --git a/os/macos/openttd.icns b/os/macosx/openttd.icns Binary files differindex 87fd15eae..87fd15eae 100644 --- a/os/macos/openttd.icns +++ b/os/macosx/openttd.icns diff --git a/os/macos/openttdmidi.java b/os/macosx/openttdmidi.java index fc4e0b5b8..fc4e0b5b8 100644 --- a/os/macos/openttdmidi.java +++ b/os/macosx/openttdmidi.java diff --git a/os/macos/plistgen.sh b/os/macosx/plistgen.sh index 0968f8dc7..0968f8dc7 100755 --- a/os/macos/plistgen.sh +++ b/os/macosx/plistgen.sh diff --git a/os/macos/track_starter b/os/macosx/track_starter index 809491181..809491181 100755 --- a/os/macos/track_starter +++ b/os/macosx/track_starter diff --git a/readme.txt b/readme.txt index 776a40de7..50545250c 100644 --- a/readme.txt +++ b/readme.txt @@ -212,7 +212,7 @@ That's all! You should now be able to select the language in the game options. X.X) Credits: ---- -------- The OpenTTD team (in alphabetical order): - Bjarni Corfitzen (Bjarni) - MacOS port + Bjarni Corfitzen (Bjarni) - MacOSX port, coder Victor Fischer (Celestar) - Programming everywhere you need him to Tamas Faragó (Darkvater) - Lead programmer Dominik Scherer (dominik81) - Lead programmer |