cpp/openttd-patchpack/source Changeset - r2730:99fe1b43f44b

Changeset - r2730:99fe1b43f44b

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

bjarni - 19 years ago 2005-12-09 13:07:21
bjarni@openttd.org

(svn r3275) -Fix: [OSX] removed libpng support and error dialogs from jaguar crosscompiles to fix crash

4 files changed with 7 insertions and 2 deletions:

Makefile

os/macosx/Makefile.setup

stdafx.h

unix.c

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -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

os/macosx/Makefile.setup

➞

Show inline comments

@@ @@ -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 @@

stdafx.h

➞

Show inline comments

@@ @@ -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"

unix.c

➞

Show inline comments

@@ @@ -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" );

0 comments (0 inline, 0 general)