From 8a48316636d6f48b87fdfa31ba40f758ebc17a19 Mon Sep 17 00:00:00 2001 From: molivier Date: Mon, 21 Mar 2005 08:44:35 +0000 Subject: [PATCH] Added Mac OS X support to the makefiles. Note that the client doesn't compile yet since some files are still missing (vid_agl.c mainly) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5114 d7cf8633-e32d-0410-b094-e92efae38249 --- makefile | 28 ++++++++++++++++++++++++---- makefile.inc | 19 +++++++++++++++++++ 2 files changed, 43 insertions(+), 4 deletions(-) diff --git a/makefile b/makefile index e959e4e4..62d13e4e 100644 --- a/makefile +++ b/makefile @@ -11,13 +11,16 @@ else DP_ARCH:=$(shell uname) ifneq ($(filter %BSD,$(DP_ARCH)),) DP_MAKE_TARGET=bsd +else +ifeq ($(DP_ARCH), Darwin) + DP_MAKE_TARGET=macosx else DP_MAKE_TARGET=linux -endif -endif - -endif +endif # ifeq ($(DP_ARCH), Darwin) +endif # ifneq ($(filter %BSD,$(DP_ARCH)),) +endif # ifdef windir +endif # ifndef DP_MAKE_TARGET # If we're not on compiling for Win32, we need additional information ifneq ($(DP_MAKE_TARGET), mingw) @@ -58,6 +61,23 @@ ifeq ($(DP_MAKE_TARGET), linux) EXE_SDL=$(EXE_UNIXSDL) endif +# Mac OS X configuration +ifeq ($(DP_MAKE_TARGET), macosx) + OBJ_SOUND=$(OBJ_MACOSXSOUND) + LIB_SOUND=$(LIB_MACOSXSOUND) + OBJ_CD=$(OBJ_MACOSXCD) + + OBJ_CL=$(OBJ_AGL) + + LDFLAGS_CL=$(LDFLAGS_MACOSXCL) + LDFLAGS_SV=$(LDFLAGS_MACOSXSV) + LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL) + + EXE_CL=$(EXE_UNIXCL) + EXE_SV=$(EXE_UNIXSV) + EXE_SDL=$(EXE_UNIXSDL) +endif + # BSD configuration ifeq ($(DP_MAKE_TARGET), bsd) ifeq ($(DP_ARCH),FreeBSD) diff --git a/makefile.inc b/makefile.inc index 86aa7609..7589c099 100644 --- 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 -- 2.39.2