X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=makefile;h=59504d117a17ed57ba5af39e61300fde1da12569;hb=dfc53802fb3f67b604e61a92fc6a268651b38b04;hp=3e543f62e5390a71f5524a0833661df428047c63;hpb=ba47f7157b0434dab70368b0c09c00af185c9fd4;p=xonotic%2Fdarkplaces.git

diff --git a/makefile b/makefile
index 3e543f62..59504d11 100644
--- a/makefile
+++ b/makefile
@@ -26,10 +26,24 @@ 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)
+# If we're targeting an x86 CPU we want to enable DP_SSE (CFLAGS_SSE and SSE2)
+ifeq ($(DP_MAKE_TARGET), mingw)
+	DP_SSE:=1
+else
 	DP_MACHINE:=$(shell uname -m)
+	ifeq ($(DP_MACHINE),x86_64)
+		DP_SSE:=1
+	else
+	ifeq ($(DP_MACHINE),i686)
+		DP_SSE:=1
+	else
+	ifeq ($(DP_MACHINE),i386)
+		DP_SSE:=1
+	else
+		DP_SSE:=0
+	endif # ifeq ($(DP_MACHINE),i386)
+	endif # ifeq ($(DP_MACHINE),i686)
+	endif # ifeq ($(DP_MACHINE),x86_64)
 endif
 
 # Makefile name
@@ -143,7 +157,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
 	endif
 
 	DP_LINK_ZLIB?=shared
-	DP_LINK_JPEG?=shared
+	DP_LINK_JPEG?=dlopen
 	DP_LINK_ODE?=dlopen
 	DP_LINK_CRYPTO?=dlopen
 	DP_LINK_CRYPTO_RIJNDAEL?=dlopen
@@ -230,7 +244,7 @@ ifeq ($(WIN32RELEASE), 1)
 #	TARGET=i686-pc-mingw32
 #	CC=$(TARGET)-g++
 #	WINDRES=$(TARGET)-windres
-	CPUOPTIMIZATIONS=-march=i686 -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math
+	CPUOPTIMIZATIONS=-march=pentium3 -mfpmath=sse -fno-math-errno -ffinite-math-only -fno-rounding-math -fno-signaling-nans -fno-trapping-math
 #       CPUOPTIMIZATIONS+=-DUSE_WSPIAPI_H -DSUPPORTIPV6
 	LDFLAGS_WINCOMMON=-Wl,--large-address-aware
 else
@@ -329,7 +343,7 @@ ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), shared)
 	LIB_CRYPTO_RIJNDAEL=-ld0_rijndael
 	CFLAGS_CRYPTO_RIJNDAEL=-DLINK_TO_CRYPTO_RIJNDAEL
 endif
-ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), shared)
+ifeq ($(DP_LINK_CRYPTO_RIJNDAEL), dlopen)
 	LIB_CRYPTO_RIJNDAEL=
 	CFLAGS_CRYPTO_RIJNDAEL=
 endif
@@ -402,6 +416,10 @@ ifdef DP_PRELOAD_DEPENDENCIES
 endif
 endif
 
+CFLAGS_NET=
+# Systems without IPv6 support should uncomment this:
+#CFLAGS_NET+=-DNOSUPPORTIPV6
+
 ##### GNU Make specific definitions #####
 
 DO_LD=$(CC) -o ../../../$@ $^ $(LDFLAGS)