petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

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

Browse Source
This commit is contained in:
bjarni
2005-10-07 16:48:53 +00:00
parent 9134e19d7e
commit 7ba69ad146
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

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

2
driver.c
View File

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