Refactor DP_MACHINE logic in makefile and makefile.inc because it was

broken on mingw.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12262 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=97ccfe67df97b42b26e36f1cd92c8dad52bac4a3

diff --git a/makefile b/makefile
index 970064c57f266fca1945e6e3a8f26993b6d30aa6..59504d117a17ed57ba5af39e61300fde1da12569 100644 (file)
--- 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

diff --git a/makefile.inc b/makefile.inc
index 32417d176689185009f5a1424e1ff58315966b67..2a59220e46501899dd9fa1fc51943ead02efe103 100644 (file)
--- a/makefile.inc
+++ b/makefile.inc
@@ -180,23 +180,13 @@ CFLAGS_RELEASE=
 CFLAGS_RELEASE_PROFILE=-fbranch-probabilities
 CFLAGS_SDL=$(SDLCONFIG_CFLAGS)
 
-ifeq ($(DP_MACHINE),x86_64)
-       CFLAGS_SSE=-msse
-       CFLAGS_SSE2=-msse2
-else
-ifeq ($(DP_MACHINE),i686)
-       CFLAGS_SSE=-msse
-       CFLAGS_SSE2=-msse2
-else
-ifeq ($(DP_MACHINE),i386)
+ifeq ($(DP_SSE),1)
        CFLAGS_SSE=-msse
        CFLAGS_SSE2=-msse2
 else
        CFLAGS_SSE=
        CFLAGS_SSE2=
-endif # ifeq ($(DP_MACHINE),i386)
-endif # ifeq ($(DP_MACHINE),i686)
-endif # ifeq ($(DP_MACHINE),x86_64)
+endif # ifeq ($(DP_SSE),1)
 
 OPTIM_DEBUG=$(CPUOPTIMIZATIONS)
 #OPTIM_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops $(CPUOPTIMIZATIONS)