X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=makefile;h=32b30e4c28f9c4f7c9344642928c007ab642d9cc;hb=0fdf3adaaa6cba669181a8e366d65f88a14be473;hp=1bf6a24bf3043ef8aebf07c00a48dedcb2ed9d4f;hpb=8cd5ab6967c893e587060107bff54aca92d0e20b;p=xonotic%2Fdarkplaces.git

diff --git a/makefile b/makefile
index 1bf6a24b..32b30e4c 100644
--- a/makefile
+++ b/makefile
@@ -3,7 +3,7 @@
 ifndef DP_MAKE_TARGET
 
 # Win32
-ifdef windir
+ifdef WINDIR
 	DP_MAKE_TARGET=mingw
 else
 
@@ -183,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
@@ -251,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)