cpp/openttd-patchpack/source Changeset - r2500:4297cb3c6bc0

Changeset - r2500:4297cb3c6bc0

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

bjarni - 19 years ago 2005-10-07 16:48:53
bjarni@openttd.org

(svn r3026) -Fix: [OSX] fixed bug that prevented dedicated servers from compiling (introduced in r3022)

2 files changed with 10 insertions and 1 deletions:

Makefile

driver.c

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -404,6 +404,11 @@ LDFLAGS += -lnsl -lsocket @@
 endif
 endif
 # tell the source that we are building a dedicated server
 ifdef DEDICATED
 CDEFS += -DDEDICATED
 endif
 # SDL config
 ifdef WITH_SDL
 CDEFS += -DWITH_SDL
@@ @@ -498,9 +503,11 @@ ifndef SECOND_DATA_PATH @@
 SECOND_DATA_PATH:="$(OSXAPP)/Contents/Data/"
 endif
 ifndef CUSTOM_LANG_DIR
 ifndef DEDICATED
 CUSTOM_LANG_DIR:="$(OSXAPP)/Contents/Lang/"
 endif
 endif
 endif
 ifdef MIDI
 CDEFS += -DEXTERNAL_PLAYER=\"$(MIDI)\"
@@ @@ -712,8 +719,10 @@ endif @@
 ifdef OSX
 OBJC_SOURCES += os/macosx/macos.m
 ifndef DEDICATED
 C_SOURCES    += music/qtmidi.c
 endif
 endif
 OBJS = $(C_SOURCES:%.c=%.o) $(CXX_SOURCES:%.cpp=%.o) $(OBJC_SOURCES:%.m=%.o)

driver.c

➞

Show inline comments

@@ @@ -52,7 +52,7 @@ static const DriverDesc _music_driver_de @@
 #ifdef WIN32
 	M("win32",   "Win32 MIDI Driver",       &_win32_music_driver),
 #endif
-#ifdef __APPLE__
+#if defined(__APPLE__) && !defined(DEDICATED)
 	M("qt",      "QuickTime MIDI Driver",   &_qtime_music_driver),
 #endif
 #ifdef UNIX

0 comments (0 inline, 0 general)