diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | os/macosx/Makefile.setup | 2 | ||||
| -rw-r--r-- | stdafx.h | 2 | ||||
| -rw-r--r-- | unix.c | 2 |
4 files changed, 7 insertions, 2 deletions
@@ -518,6 +518,7 @@ ifdef OSX ifdef JAGUAR # ensure that changing libpathnames will not overwrite anything in the binary LDFLAGS += -headerpad_max_install_names + CFLAGS += -DJAGUAR_CROSSCOMPILE endif ifndef DEDICATED @@ -753,7 +754,9 @@ C_SOURCES += music/extmidi.c endif ifdef OSX +ifndef JAGUAR OBJC_SOURCES += os/macosx/macos.m +endif ifndef DEDICATED C_SOURCES += music/qtmidi.c endif diff --git a/os/macosx/Makefile.setup b/os/macosx/Makefile.setup index 01c2813af..9b8441856 100644 --- a/os/macosx/Makefile.setup +++ b/os/macosx/Makefile.setup @@ -136,4 +136,6 @@ ifdef JAGUAR WITH_NETWORK:= # crosscompiling for jaguar should always be static STATIC:=1 + # libpng appears to break it too + WITH_PNG:= endif
\ No newline at end of file @@ -9,7 +9,7 @@ // MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal // strgen always runs from terminal and don't need a window for asserts -#if !defined(__APPLE__) || defined(STRGEN) +#if !defined(__APPLE__) || defined(STRGEN) || defined(JAGUAR_CROSSCOMPILE) # include <assert.h> #else # include "os/macosx/macos.h" @@ -434,7 +434,7 @@ void ShowInfo(const char *str) void ShowOSErrorBox(const char *buf) { -#if defined(__APPLE__) +#if defined(__APPLE__) && !defined(JAGUAR_CROSSCOMPILE) // this creates an NSAlertPanel with the contents of 'buf' // this is the native and nicest way to do this on OSX ShowMacDialog( buf, "See readme for more info\nMost likely you are missing files from the original TTD", "Quit" ); |