X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=makefile;h=32b30e4c28f9c4f7c9344642928c007ab642d9cc;hb=f0314987446917df899bfb296bc5b0bdd9ccf8e7;hp=479d62bc0b282cd410dc953692e7b0fbdfc4c239;hpb=3a466b8a6397138a30c965e4a7f75e181d6f0181;p=xonotic%2Fdarkplaces.git

diff --git a/makefile b/makefile
index 479d62bc..32b30e4c 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ifndef DP_MAKE_TARGET
 
 # Win32
-ifdef windir
+ifdef WINDIR
 	DP_MAKE_TARGET=mingw
 else
 
@@ -61,6 +61,10 @@ ifeq ($(DP_MAKE_TARGET), linux)
 	LDFLAGS_SV=$(LDFLAGS_LINUXSV)
 	LDFLAGS_SDL=$(LDFLAGS_LINUXSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
 	EXE_CL=$(EXE_UNIXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
@@ -82,6 +86,10 @@ ifeq ($(DP_MAKE_TARGET), macosx)
 	LDFLAGS_SV=$(LDFLAGS_MACOSXSV)
 	LDFLAGS_SDL=$(LDFLAGS_MACOSXSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_MACOSXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_MACOSXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_MACOSXSTATICLIBS)
+
 	EXE_CL=$(EXE_MACOSXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
@@ -109,6 +117,10 @@ ifeq ($(DP_MAKE_TARGET), sunos)
 	LDFLAGS_SV=$(LDFLAGS_SUNOSSV)
 	LDFLAGS_SDL=$(LDFLAGS_SUNOSSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
 	EXE_CL=$(EXE_UNIXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
@@ -134,6 +146,10 @@ endif
 	LDFLAGS_SV=$(LDFLAGS_BSDSV)
 	LDFLAGS_SDL=$(LDFLAGS_BSDSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
 	EXE_CL=$(EXE_UNIXCL)
 	EXE_SV=$(EXE_UNIXSV)
 	EXE_SDL=$(EXE_UNIXSDL)
@@ -155,6 +171,10 @@ ifeq ($(DP_MAKE_TARGET), mingw)
 	LDFLAGS_SV=$(LDFLAGS_WINSV)
 	LDFLAGS_SDL=$(LDFLAGS_WINSDL)
 
+	SDLCONFIG_CFLAGS=$(SDLCONFIG_UNIXCFLAGS)
+	SDLCONFIG_LIBS=$(SDLCONFIG_UNIXLIBS)
+	SDLCONFIG_STATICLIBS=$(SDLCONFIG_UNIXSTATICLIBS)
+
 	EXE_CL=$(EXE_WINCL)
 	EXE_SV=$(EXE_WINSV)
 	EXE_SDL=$(EXE_WINSDL)
@@ -163,6 +183,14 @@ ifeq ($(DP_MAKE_TARGET), mingw)
 	EXE_SDLNEXUIZ=$(EXE_WINSDLNEXUIZ)
 endif
 
+ifeq ($(WIN32RELEASE), 1)
+	CPUOPTIMIZATIONS=-march=i686 -DSUPPORTDIRECTX -DUSE_WSPIAPI_H
+endif
+
+ifeq ($(WIN64RELEASE), 1)
+	CPUOPTIMIZATIONS=
+endif
+
 ##### Sound configuration #####
 
 ifndef DP_SOUND_API
@@ -205,10 +233,14 @@ ifeq ($(DP_SOUND_API), WIN)
 	LIB_SOUND=$(LIB_SND_WIN)
 endif
 
+ifeq ($(DP_SOUND_API),3DRAS)
+	OBJ_SOUND=$(OBJ_SND_3DRAS)
+	LIB_SOUND=$(LIB_SND_3DRAS)
+endif
 
 ##### Extra CFLAGS #####
 
-CFLAGS_MAKEDEP?=-MD
+CFLAGS_MAKEDEP?=-MMD
 ifdef DP_FS_BASEDIR
 	CFLAGS_FS=-DDP_FS_BASEDIR='\"$(DP_FS_BASEDIR)\"'
 else
@@ -227,6 +259,14 @@ ifdef DP_PRELOAD_DEPENDENCIES
 endif
 endif
 
+ifdef DP_LINK_TO_LIBJPEG
+	LDFLAGS_LIBJPEG?=-ljpeg
+	LDFLAGS_CL+=$(LDFLAGS_LIBJPEG)
+	LDFLAGS_SV+=$(LDFLAGS_LIBJPEG)
+	LDFLAGS_SDL+=$(LDFLAGS_LIBJPEG)
+	CFLAGS_PRELOAD+=$(CFLAGS_LIBJPEG) -DLINK_TO_LIBJPEG
+endif
+
 ##### GNU Make specific definitions #####
 
 DO_LD=$(CC) -o $@ $^ $(LDFLAGS)