X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=makefile;h=f4c054abfe21c1cb0d4e5dc9c0225479f479fdf4;hp=e959e4e4636c9c2300d553d43c775f8a03130a85;hb=74df347bf8eedd22952257d046d754bd1d43fde9;hpb=8e579bbf57c9235bc3c11838e5a68bc52be3e9df

diff --git a/makefile b/makefile
index e959e4e4..f4c054ab 100644
--- a/makefile
+++ b/makefile
@@ -11,13 +11,20 @@ else
 DP_ARCH:=$(shell uname)
 ifneq ($(filter %BSD,$(DP_ARCH)),)
 	DP_MAKE_TARGET=bsd
+else
+ifeq ($(DP_ARCH), Darwin)
+	DP_MAKE_TARGET=macosx
+else
+ifeq ($(DP_ARCH), SunOS)
+	DP_MAKE_TARGET=sunos
 else
 	DP_MAKE_TARGET=linux
-endif
 
-endif
-
-endif
+endif  # ifeq ($(DP_ARCH), SunOS)
+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 +65,42 @@ 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
+
+# SunOS configuration (Solaris)
+ifeq ($(DP_MAKE_TARGET), sunos)
+	OBJ_SOUND=$(OBJ_SUNOSSOUND)
+	LIB_SOUND=$(LIB_SUNOSSOUND)
+	OBJ_CD=$(OBJ_SUNOSCD)
+
+	OBJ_CL=$(OBJ_GLX)
+
+	CFLAGS_EXTRA=$(CFLAGS_SUNOS)
+
+	LDFLAGS_CL=$(LDFLAGS_SUNOSCL)
+	LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
+	LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
+
+	EXE_CL=$(EXE_UNIXCL)
+	EXE_SV=$(EXE_UNIXSV)
+	EXE_SDL=$(EXE_UNIXSDL)
+endif
+
 # BSD configuration
 ifeq ($(DP_MAKE_TARGET), bsd)
 ifeq ($(DP_ARCH),FreeBSD)