(svn r2904) Stupid editors, and renaming files with the same name just different casing is not really possible, so here comes another commit
--- a/Makefile Thu Sep 01 21:10:05 2005 +0000
+++ b/Makefile Thu Sep 01 21:19:07 2005 +0000
@@ -791,7 +791,7 @@
$(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
+ 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/
@@ -896,7 +896,7 @@
@echo 'const char _openttd_revision[] = "$(REV)";' >>rev.c.new
@# some additions for MorphOS versions tag
@echo '#ifdef __MORPHOS__' >>rev.c.new
- @echo 'const char morphos_versions_tag[] = "\\0$$VER: OpenTTD $(REV) ('${BUILDDATE}') OpenTTD Team [MorphOS, PowerPC]";' >>rev.c.new
+ @echo 'const char morphos_versions_tag[] = "\\0$$VER: OpenTTD $(REV) ('${BUILDDATE}') © OpenTTD Team [MorphOS, PowerPC]";' >>rev.c.new
@echo '#endif' >>rev.c.new
@# Only update the real rev.c if it actually changed, to prevent
@# useless rebuilds.
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/os/macosx/1openttdmidi.java Thu Sep 01 21:19:07 2005 +0000
@@ -0,0 +1,55 @@
+//
+// OpenTTDMidi.java
+// OpenTTDMidi
+//
+// Created by Joshua King on Sun Apr 25 2004.
+// Copyright (c) 2004 __MyCompanyName__. All rights reserved.
+//
+import java.io.*;
+import java.util.*;
+import javax.sound.midi.*;
+
+public class OpenTTDMidi {
+
+ public static void main (String args[]) {
+ // Currently command line is the MIDI file
+ if (args.length == 1) {
+ Sequencer s2 = null;
+
+ try {
+ s2 = MidiSystem.getSequencer();
+ s2.open();
+ } catch (MidiUnavailableException mue) {
+ System.exit(1);
+ }
+
+ Sequence s = null;
+
+ try {
+ s = MidiSystem.getSequence(new File(args[0]));
+ } catch (InvalidMidiDataException imde) {
+ System.exit(2);
+ } catch (IOException ioe) {
+ System.exit(3);
+ }
+
+ try {
+ s2.setSequence(s);
+ s2.setMicrosecondPosition(0);
+ s2.start();
+ for (long l = 0; l < (s.getMicrosecondLength() / 1000000); l++) {
+ try {
+ //System.out.print(".");
+ Thread.currentThread().sleep(1000);
+ } catch (InterruptedException ie) {}
+ }
+ System.out.println();
+ } catch (InvalidMidiDataException imde) {
+ }
+
+ s2.stop();
+ s2.close();
+ System.exit(0);
+ }
+ }
+}
--- a/os/macosx/openttdmidi.java Thu Sep 01 21:10:05 2005 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-//
-// OpenTTDMidi.java
-// OpenTTDMidi
-//
-// Created by Joshua King on Sun Apr 25 2004.
-// Copyright (c) 2004 __MyCompanyName__. All rights reserved.
-//
-import java.io.*;
-import java.util.*;
-import javax.sound.midi.*;
-
-public class OpenTTDMidi {
-
- public static void main (String args[]) {
- // Currently command line is the MIDI file
- if (args.length == 1) {
- Sequencer s2 = null;
-
- try {
- s2 = MidiSystem.getSequencer();
- s2.open();
- } catch (MidiUnavailableException mue) {
- System.exit(1);
- }
-
- Sequence s = null;
-
- try {
- s = MidiSystem.getSequence(new File(args[0]));
- } catch (InvalidMidiDataException imde) {
- System.exit(2);
- } catch (IOException ioe) {
- System.exit(3);
- }
-
- try {
- s2.setSequence(s);
- s2.setMicrosecondPosition(0);
- s2.start();
- for (long l = 0; l < (s.getMicrosecondLength() / 1000000); l++) {
- try {
- //System.out.print(".");
- Thread.currentThread().sleep(1000);
- } catch (InterruptedException ie) {}
- }
- System.out.println();
- } catch (InvalidMidiDataException imde) {
- }
-
- s2.stop();
- s2.close();
- System.exit(0);
- }
- }
-}