X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=makefile.inc;h=2567612543e010e2aba67c906602f4de789a7e75;hb=1a711173535d4b5f4364b66177745aab165330d8;hp=f613591e1f2044d708078f4daa2acff16f75841d;hpb=49f0e1cbc8bc4ea8a165e8b86092c40bf4599a8e;p=xonotic%2Fdarkplaces.git

diff --git a/makefile.inc b/makefile.inc
index f613591e..25676125 100644
--- a/makefile.inc
+++ b/makefile.inc
@@ -37,9 +37,9 @@ SDLCONFIG_UNIXLIBS?=`$(SDL_CONFIG) --libs`
 SDLCONFIG_UNIXLIBS_X11?=-lX11
 SDLCONFIG_UNIXSTATICLIBS?=`$(SDL_CONFIG) --static-libs`
 SDLCONFIG_UNIXSTATICLIBS_X11?=-lX11
-SDLCONFIG_MACOSXCFLAGS=-I/Library/Frameworks/SDL2.framework/Headers -I$(HOME)/Library/Frameworks/SDL2.framework/Headers
-SDLCONFIG_MACOSXLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
-SDLCONFIG_MACOSXSTATICLIBS=-F$(HOME)/Library/Frameworks/ -framework SDL2 -framework Cocoa $(SDLCONFIG_MACOSXCFLAGS)
+SDLCONFIG_MACOSXCFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+SDLCONFIG_MACOSXLIBS=$(SDLCONFIG_UNIXLIBS)
+SDLCONFIG_MACOSXSTATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
 STRIP?=strip
 
 
@@ -80,6 +80,7 @@ OBJ_COMMON= \
 	com_ents.o \
 	com_ents4.o \
 	com_game.o \
+	com_infostring.o \
 	com_msg.o \
 	common.o \
 	console.o \
@@ -242,7 +243,7 @@ LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -lrt -ldl $(LDFLAGS_UNIXSDL)
 
 # Link
 LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
-LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) ../../../SDLMain.m
+LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl -framework IOKit $(SDLCONFIG_STATICLIBS) #../../../SDLMain.m
 
 
 ##### SunOS specific variables #####