patch from div0 to make universal-binary builds of darkplaces possible on Mac OS X

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6475 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/BSDmakefile b/BSDmakefile
index 6d86a291f161ae5c3b48c743d7baa5b62a306586..1f8bad720d96d952cee345f785d7276cb728eabb 100644 (file)
--- a/BSDmakefile
+++ b/BSDmakefile
@@ -7,6 +7,7 @@ DP_MAKE_TARGET=bsd
 .endif
 DP_ARCH != uname
 
+CFLAGS_MAKEDEP=-MD
 
 # Command used to delete files
 CMD_RM=$(CMD_UNIXRM)

diff --git a/makefile b/makefile
index e563564dc8e6aaea030f7b38049f427ab895dd35..ba1b76edfa6b7a976ea9dbb5f4e166b778b04ec1 100644 (file)
--- a/makefile
+++ b/makefile
@@ -26,6 +26,8 @@ endif  # ifneq ($(filter %BSD,$(DP_ARCH)),)
 endif  # ifdef windir
 endif  # ifndef DP_MAKE_TARGET
 
+CFLAGS_MAKEDEP=-MD
+
 # If we're not on compiling for Win32, we need additional information
 ifneq ($(DP_MAKE_TARGET), mingw)
        DP_ARCH:=$(shell uname)
@@ -88,6 +90,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)

diff --git a/makefile.inc b/makefile.inc
index efc5cdc470b4e54a845b639dcd8941495aa982de..86b608cc8242250ba449039f26fbaea8078bce36 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -137,7 +137,7 @@ OBJ_SDL= builddate.c sys_sdl.o vid_sdl.o $(OBJ_SND_COMMON) snd_sdl.o cd_sdl.o $(
 
 # Compilation
 # CFLAGS_COMMON=-MD -Wall -Werror
-CFLAGS_COMMON=-MD -Wall -Wsign-compare
+CFLAGS_COMMON=$(CFLAGS_MAKEDEP) -Wall -Wsign-compare
 CFLAGS_DEBUG=-ggdb
 CFLAGS_PROFILE=-g -pg -ggdb
 CFLAGS_RELEASE=