Added CSQC globals dmg_take, dmg_save and dmg_origin. These globals correspond to...

[xonotic/darkplaces.git] / makefile

diff --git a/makefile b/makefile
index e563564dc8e6aaea030f7b38049f427ab895dd35..479d62bc0b282cd410dc953692e7b0fbdfc4c239 100644 (file)
--- a/makefile
+++ b/makefile
@@ -88,6 +88,10 @@ ifeq ($(DP_MAKE_TARGET), macosx)
        EXE_CLNEXUIZ=$(EXE_MACOSXCLNEXUIZ)
        EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
        EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+
+       ifeq ($(word 2, $(filter -arch, $(CC))), -arch)
+               CFLAGS_MAKEDEP=
+       endif
 endif
 
 # SunOS configuration (Solaris)
@@ -159,7 +163,6 @@ ifeq ($(DP_MAKE_TARGET), mingw)
        EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 endif
 
-
 ##### Sound configuration #####
 
 ifndef DP_SOUND_API
@@ -203,6 +206,27 @@ ifeq ($(DP_SOUND_API), WIN)
 endif
 
 
+##### Extra CFLAGS #####
+
+CFLAGS_MAKEDEP?=-MD
+ifdef DP_FS_BASEDIR
+       CFLAGS_FS=-DDP_FS_BASEDIR='\"$(DP_FS_BASEDIR)\"'
+else
+       CFLAGS_FS=
+endif
+
+CFLAGS_PRELOAD=
+ifneq ($(DP_MAKE_TARGET), mingw)
+ifdef DP_PRELOAD_DEPENDENCIES
+# DP_PRELOAD_DEPENDENCIES: when set, link against the libraries needed using -l
+# dynamically so they won't get loaded at runtime using dlopen
+       LDFLAGS_CL+=$(LDFLAGS_UNIXCL_PRELOAD)
+       LDFLAGS_SV+=$(LDFLAGS_UNIXSV_PRELOAD)
+       LDFLAGS_SDL+=$(LDFLAGS_UNIXSDL_PRELOAD)
+       CFLAGS_PRELOAD=$(CFLAGS_UNIX_PRELOAD)
+endif
+endif
+
 ##### GNU Make specific definitions #####
 
 DO_LD=$(CC) -o $@ $^ $(LDFLAGS)