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

[xonotic/darkplaces.git] / makefile

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