mirror of https://github.com/OpenTTD/OpenTTD
(svn r3026) -Fix: [OSX] fixed bug that prevented dedicated servers from compiling (introduced in r3022)
parent
9134e19d7e
commit
7ba69ad146
9
Makefile
9
Makefile
|
@ -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)
|
||||
|
||||
|
|
2
driver.c
2
driver.c
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue