# HG changeset patch
# User bjarni
# Date 1128703733 0
# Node ID 92bc404b86ca23629d460ecb5e137ac08bcbdc39
# Parent  b8be4599b9409b9daf2498f7aa04a290e1af31cf
(svn r3026) -Fix: [OSX] fixed bug that prevented dedicated servers from compiling (introduced in r3022)

diff -r b8be4599b940 -r 92bc404b86ca Makefile
--- a/Makefile	Fri Oct 07 15:53:33 2005 +0000
+++ b/Makefile	Fri Oct 07 16:48:53 2005 +0000
@@ -404,6 +404,11 @@
 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 @@
 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 @@
 
 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)
 
diff -r b8be4599b940 -r 92bc404b86ca driver.c
--- a/driver.c	Fri Oct 07 15:53:33 2005 +0000
+++ b/driver.c	Fri Oct 07 16:48:53 2005 +0000
@@ -52,7 +52,7 @@
 #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