(svn r3275) -Fix: [OSX] removed libpng support and error dialogs from jaguar crosscompiles to fix crash
--- a/Makefile Fri Dec 09 12:15:52 2005 +0000
+++ b/Makefile Fri Dec 09 13:07:21 2005 +0000
@@ -518,6 +518,7 @@
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 @@
endif
ifdef OSX
+ifndef JAGUAR
OBJC_SOURCES += os/macosx/macos.m
+endif
ifndef DEDICATED
C_SOURCES += music/qtmidi.c
endif
--- a/os/macosx/Makefile.setup Fri Dec 09 12:15:52 2005 +0000
+++ b/os/macosx/Makefile.setup Fri Dec 09 13:07:21 2005 +0000
@@ -136,4 +136,6 @@
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
--- a/stdafx.h Fri Dec 09 12:15:52 2005 +0000
+++ b/stdafx.h Fri Dec 09 13:07:21 2005 +0000
@@ -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"
--- a/unix.c Fri Dec 09 12:15:52 2005 +0000
+++ b/unix.c Fri Dec 09 13:07:21 2005 +0000
@@ -434,7 +434,7 @@
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" );