mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
bjarni 2005-12-09 13:07:21 +00:00
parent 111e5ef0fd
commit 6cfdfcc4ba
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -518,6 +518,7 @@ ifdef OSX
ifdef JAGUAR ifdef JAGUAR
# ensure that changing libpathnames will not overwrite anything in the binary # ensure that changing libpathnames will not overwrite anything in the binary
LDFLAGS += -headerpad_max_install_names LDFLAGS += -headerpad_max_install_names
CFLAGS += -DJAGUAR_CROSSCOMPILE
endif endif
ifndef DEDICATED ifndef DEDICATED
@ -753,7 +754,9 @@ C_SOURCES += music/extmidi.c
endif endif
ifdef OSX ifdef OSX
ifndef JAGUAR
OBJC_SOURCES += os/macosx/macos.m OBJC_SOURCES += os/macosx/macos.m
endif
ifndef DEDICATED ifndef DEDICATED
C_SOURCES += music/qtmidi.c C_SOURCES += music/qtmidi.c
endif endif

2
os/macosx/Makefile.setup
View File

@ -136,4 +136,6 @@ ifdef JAGUAR
WITH_NETWORK:= WITH_NETWORK:=
# crosscompiling for jaguar should always be static # crosscompiling for jaguar should always be static
STATIC:=1 STATIC:=1
# libpng appears to break it too
WITH_PNG:=
endif endif

2
stdafx.h
View File

@ -9,7 +9,7 @@
// MacOS X will use an NSAlert to display failed assertaions since they're lost unless running from a terminal // 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 // 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> # include <assert.h>
#else #else
# include "os/macosx/macos.h" # include "os/macosx/macos.h"

2
unix.c
View File

@ -434,7 +434,7 @@ void ShowInfo(const char *str)
void ShowOSErrorBox(const char *buf) void ShowOSErrorBox(const char *buf)
{ {
#if defined(__APPLE__) #if defined(__APPLE__) && !defined(JAGUAR_CROSSCOMPILE)
// this creates an NSAlertPanel with the contents of 'buf' // this creates an NSAlertPanel with the contents of 'buf'
// this is the native and nicest way to do this on OSX // 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" ); ShowMacDialog( buf, "See readme for more info\nMost likely you are missing files from the original TTD", "Quit" );