X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=makefile;h=19272f8315aabece2aca056c1201e5642ec032c5;hb=09d3eabe1610af8dd0a5d8530d90adcc50d1083d;hp=87de6620beae8137ef5adcea39760e0bacbc8604;hpb=e45d698e8e29a16df40e5bcc404ec3b5281e0b47;p=xonotic%2Fdarkplaces.git

diff --git a/makefile b/makefile
index 87de6620..19272f83 100644
--- a/makefile
+++ b/makefile
@@ -1,4 +1,4 @@
-#####  DP_MAKE_TARGET autodetection and arch specific variables ##### 
+#####  DP_MAKE_TARGET autodetection and arch specific variables #####
 
 ifndef DP_MAKE_TARGET
 
@@ -9,14 +9,27 @@ else
 
 # UNIXes
 DP_ARCH:=$(shell uname)
-ifeq ($(DP_ARCH),NetBSD)
+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  # 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)
+	DP_ARCH:=$(shell uname)
+	DP_MACHINE:=$(shell uname -m)
 endif
 
 
@@ -27,14 +40,22 @@ else
 	CMD_RM=$(CMD_UNIXRM)
 endif
 
+# 64bits AMD CPUs use another lib directory
+ifeq ($(DP_MACHINE),x86_64)
+	UNIX_X11LIBPATH:=/usr/X11R6/lib64
+else
+	UNIX_X11LIBPATH:=/usr/X11R6/lib
+endif
+
 
 # Linux configuration
 ifeq ($(DP_MAKE_TARGET), linux)
-	OBJ_SOUND=$(OBJ_LINUXSOUND)
-	LIB_SOUND=$(LIB_LINUXSOUND)
+	DEFAULT_SNDAPI=ALSA
 	OBJ_CD=$(OBJ_LINUXCD)
 
 	OBJ_CL=$(OBJ_GLX)
+	OBJ_ICON=
+	OBJ_ICON_NEXUIZ=
 
 	LDFLAGS_CL=$(LDFLAGS_LINUXCL)
 	LDFLAGS_SV=$(LDFLAGS_LINUXSV)
@@ -43,15 +64,71 @@ ifeq ($(DP_MAKE_TARGET), linux)
 	EXE_CL=$(EXE_UNIXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
+	EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+	EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+	EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
+endif
+
+# Mac OS X configuration
+ifeq ($(DP_MAKE_TARGET), macosx)
+	DEFAULT_SNDAPI=COREAUDIO
+	OBJ_CD=$(OBJ_MACOSXCD)
+
+	OBJ_CL=$(OBJ_AGL)
+	OBJ_ICON=
+	OBJ_ICON_NEXUIZ=
+
+	LDFLAGS_CL=$(LDFLAGS_MACOSXCL)
+	LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
+	LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL)
+
+	EXE_CL=$(EXE_MACOSXCL)
+	EXE_SV=$(EXE_UNIXSV)
+	EXE_SDL=$(EXE_UNIXSDL)
+	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)
+ifeq ($(DP_MAKE_TARGET), sunos)
+	DEFAULT_SNDAPI=BSD
+	OBJ_CD=$(OBJ_SUNOSCD)
+
+	OBJ_CL=$(OBJ_GLX)
+	OBJ_ICON=
+	OBJ_ICON_NEXUIZ=
+
+	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)
+	EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+	EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+	EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 endif
 
 # BSD configuration
 ifeq ($(DP_MAKE_TARGET), bsd)
-	OBJ_SOUND=$(OBJ_BSDSOUND)
-	LIB_SOUND=$(LIB_BSDSOUND)
+ifeq ($(DP_ARCH),FreeBSD)
+	DEFAULT_SNDAPI=OSS
+else
+	DEFAULT_SNDAPI=BSD
+endif
 	OBJ_CD=$(OBJ_BSDCD)
 
 	OBJ_CL=$(OBJ_GLX)
+	OBJ_ICON=
+	OBJ_ICON_NEXUIZ=
 
 	LDFLAGS_CL=$(LDFLAGS_BSDCL)
 	LDFLAGS_SV=$(LDFLAGS_BSDSV)
@@ -60,15 +137,19 @@ ifeq ($(DP_MAKE_TARGET), bsd)
 	EXE_CL=$(EXE_UNIXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
+	EXE_CLNEXUIZ=$(EXE_UNIXCLNEXUIZ)
+	EXE_SVNEXUIZ=$(EXE_UNIXSVNEXUIZ)
+	EXE_SDLNEXUIZ=$(EXE_UNIXSDLNEXUIZ)
 endif
 
 # Win32 configuration
 ifeq ($(DP_MAKE_TARGET), mingw)
-	OBJ_SOUND=$(OBJ_WINSOUND)
-	LIB_SOUND=$(LIB_WINSOUND)
+	DEFAULT_SNDAPI=WIN
 	OBJ_CD=$(OBJ_WINCD)
 
 	OBJ_CL=$(OBJ_WGL)
+	OBJ_ICON=darkplaces.o
+	OBJ_ICON_NEXUIZ=nexuiz.o
 
 	LDFLAGS_CL=$(LDFLAGS_WINCL)
 	LDFLAGS_SV=$(LDFLAGS_WINSV)
@@ -77,6 +158,62 @@ ifeq ($(DP_MAKE_TARGET), mingw)
 	EXE_CL=$(EXE_WINCL)
 	EXE_SV=$(EXE_WINSV)
 	EXE_SDL=$(EXE_WINSDL)
+	EXE_CLNEXUIZ=$(EXE_WINCLNEXUIZ)
+	EXE_SVNEXUIZ=$(EXE_WINSVNEXUIZ)
+	EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
+endif
+
+
+##### Sound configuration #####
+
+ifndef DP_SOUND_API
+	DP_SOUND_API=$(DEFAULT_SNDAPI)
+endif
+
+# NULL: no sound
+ifeq ($(DP_SOUND_API), NULL)
+	OBJ_SOUND=$(OBJ_SND_NULL)
+	LIB_SOUND=$(LIB_SND_NULL)
+endif
+
+# OSS: Open Sound System
+ifeq ($(DP_SOUND_API), OSS)
+	OBJ_SOUND=$(OBJ_SND_OSS)
+	LIB_SOUND=$(LIB_SND_OSS)
+endif
+
+# ALSA: Advanced Linux Sound Architecture
+ifeq ($(DP_SOUND_API), ALSA)
+	OBJ_SOUND=$(OBJ_SND_ALSA)
+	LIB_SOUND=$(LIB_SND_ALSA)
+endif
+
+# COREAUDIO: Core Audio
+ifeq ($(DP_SOUND_API), COREAUDIO)
+	OBJ_SOUND=$(OBJ_SND_COREAUDIO)
+	LIB_SOUND=$(LIB_SND_COREAUDIO)
+endif
+
+# BSD: BSD / Sun audio API
+ifeq ($(DP_SOUND_API), BSD)
+	OBJ_SOUND=$(OBJ_SND_BSD)
+	LIB_SOUND=$(LIB_SND_BSD)
+endif
+
+# WIN: DirectX and Win32 WAVE output
+ifeq ($(DP_SOUND_API), WIN)
+	OBJ_SOUND=$(OBJ_SND_WIN)
+	LIB_SOUND=$(LIB_SND_WIN)
+endif
+
+
+##### Extra CFLAGS #####
+
+CFLAGS_MAKEDEP?=-MD
+ifdef DP_FS_BASEDIR
+	CFLAGS_FS=-DDP_FS_BASEDIR='\"$(DP_FS_BASEDIR)\"'
+else
+	CFLAGS_FS=
 endif