diff options
author | bjarni <bjarni@openttd.org> | 2005-10-07 16:48:53 +0000 |
---|---|---|
committer | bjarni <bjarni@openttd.org> | 2005-10-07 16:48:53 +0000 |
commit | 7ba69ad146a43275f6c45311bbecaf45acbcba3a (patch) | |
tree | 4084349064dbd2bca13da4647046f76c89dfc0fb | |
parent | 9134e19d7eeb3a93ac42a61f47c6d2a95a84a1fa (diff) | |
download | openttd-7ba69ad146a43275f6c45311bbecaf45acbcba3a.tar.xz |
(svn r3026) -Fix: [OSX] fixed bug that prevented dedicated servers from compiling (introduced in r3022)
-rw-r--r-- | Makefile | 9 | ||||
-rw-r--r-- | driver.c | 2 |
2 files changed, 10 insertions, 1 deletions
@@ -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) @@ -52,7 +52,7 @@ static const DriverDesc _music_driver_descs[] = { #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 |