From 354320527a020f767395de4c76db4effd0747e8f Mon Sep 17 00:00:00 2001 From: bjarni Date: Fri, 7 Oct 2005 16:48:53 +0000 Subject: (svn r3026) -Fix: [OSX] fixed bug that prevented dedicated servers from compiling (introduced in r3022) --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 23ea10094..77ad38d29 100644 --- a/Makefile +++ b/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) -- cgit v1.2.3-54-g00ecf