fix portal lighting in a single cluster map (box map)

[xonotic/darkplaces.git] / makefile.inc

diff --git a/makefile.inc b/makefile.inc
index 79873d1df25f483bebddda78d0fa9d4bd19c6d4a..ca3e27c7a1b3a897f3a250d327a7d6eb36f08b34 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -169,6 +169,25 @@ LDFLAGS_LINUXSV=$(LDFLAGS_UNIXCOMMON) -ldl
 LDFLAGS_LINUXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL)
 
 
+##### Mac OS X specific variables #####
+
+#OBJ_MACOSXSOUND=$(OBJ_COMMONSOUND) snd_coreaudio.c
+OBJ_MACOSXSOUND=$(OBJ_NOSOUND)
+LIB_MACOSXSOUND=
+
+# If you want CD sound in Mac OS X
+#OBJ_MACOSXCD=cd_macosx.o
+# If you want no CD audio
+OBJ_MACOSXCD=$(OBJ_NOCD)
+
+# Link
+LDFLAGS_MACOSXCL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXCL)
+LDFLAGS_MACOSXSV=$(LDFLAGS_UNIXCOMMON) -ldl
+LDFLAGS_MACOSXSDL=$(LDFLAGS_UNIXCOMMON) -ldl $(LDFLAGS_UNIXSDL)
+
+OBJ_AGL= builddate.c sys_linux.o vid_agl.o $(OBJ_SOUND) $(OBJ_CD) $(OBJ_COMMON)
+
+
 ##### BSD specific variables #####
 
 OBJ_BSDSOUND=$(OBJ_COMMONSOUND) snd_bsd.o
@@ -202,8 +221,8 @@ OBJ_WGL= builddate.c darkplaces.o sys_win.o vid_wgl.o conproc.o $(OBJ_WINSOUND)
 # Link
 LDFLAGS_WINCOMMON=-lwinmm -lwsock32
 LDFLAGS_WINCL=$(LDFLAGS_WINCOMMON) -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32
-LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole -lwinmm -lwsock32
-LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON)  -mwindows -luser32 -lgdi32 -ldxguid -ldinput -lcomctl32 -lSDL
+LDFLAGS_WINSV=$(LDFLAGS_WINCOMMON) -mconsole
+LDFLAGS_WINSDL=$(LDFLAGS_WINCOMMON) `sdl-config --libs`
 EXE_WINCL=darkplaces.exe
 EXE_WINSV=darkplaces-dedicated.exe
 EXE_WINSDL=darkplaces-sdl.exe
@@ -237,13 +256,13 @@ help:
        @echo
 
 debug :
-       $(MAKE) cl-debug sv-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET)
+       $(MAKE) sdl-debug cl-debug sv-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET)
 
 profile :
-       $(MAKE) cl-profile sv-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET)
+       $(MAKE) sdl-profile cl-profile sv-profile DP_MAKE_TARGET=$(DP_MAKE_TARGET)
 
 release :
-       $(MAKE) cl-release sv-release DP_MAKE_TARGET=$(DP_MAKE_TARGET)
+       $(MAKE) sdl-release cl-release sv-release DP_MAKE_TARGET=$(DP_MAKE_TARGET)
 
 cl-debug :
        $(MAKE) bin-debug DP_MAKE_TARGET=$(DP_MAKE_TARGET) \