X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=makefile;h=36f6c93578813c3db21ac2181208c74d6a646e1c;hb=e72b42f6d10eb7fa60895279157d5525fc6eb03c;hp=46aa01075d802036b243d456e2dcab8aeb80311a;hpb=0ac96d68f0de33261676f620c324eb8b4695ba50;p=xonotic%2Fdarkplaces.git

diff --git a/makefile b/makefile
index 46aa0107..36f6c935 100644
--- a/makefile
+++ b/makefile
@@ -29,21 +29,27 @@ endif  # ifndef DP_MAKE_TARGET
 # 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 ifeq ($(OS),Windows_NT)
+	ifeq ($(PROCESSOR_ARCHITECTURE),AMD64)
+		DP_SSE:=1
+	else ifeq ($(PROCESSOR_ARCHITEW6432),AMD64)
+		DP_SSE:=1
+	else ifeq ($(PROCESSOR_ARCHITECTURE),x86)
+		DP_SSE:=1
+	else
+		DP_SSE:=0
+	endif
 else
 	DP_MACHINE:=$(shell uname -m)
 	ifeq ($(DP_MACHINE),x86_64)
 		DP_SSE:=1
-	else
-	ifeq ($(DP_MACHINE),i686)
+	else ifeq ($(DP_MACHINE),i686)
 		DP_SSE:=1
-	else
-	ifeq ($(DP_MACHINE),i386)
+	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
 endif
 
 # Makefile name
@@ -104,7 +110,7 @@ ifeq ($(DP_MAKE_TARGET), linux)
 	DP_LINK_SDL?=shared
 	DP_LINK_ZLIB?=shared
 	DP_LINK_JPEG?=shared
-	DP_LINK_ODE?=dlopen
+	DP_LINK_ODE?=
 	DP_LINK_CRYPTO?=dlopen
 	DP_LINK_CRYPTO_RIJNDAEL?=dlopen
 	DP_LINK_XMP?=dlopen
@@ -134,7 +140,7 @@ ifeq ($(DP_MAKE_TARGET), macosx)
 	DP_LINK_SDL?=shared
 	DP_LINK_ZLIB?=shared
 	DP_LINK_JPEG?=dlopen
-	DP_LINK_ODE?=dlopen
+	DP_LINK_ODE?=
 	DP_LINK_CRYPTO?=dlopen
 	DP_LINK_CRYPTO_RIJNDAEL?=dlopen
 	DP_LINK_XMP?=dlopen
@@ -170,7 +176,7 @@ ifeq ($(DP_MAKE_TARGET), sunos)
 	DP_LINK_SDL?=shared
 	DP_LINK_ZLIB?=shared
 	DP_LINK_JPEG?=shared
-	DP_LINK_ODE?=dlopen
+	DP_LINK_ODE?=
 	DP_LINK_CRYPTO?=dlopen
 	DP_LINK_CRYPTO_RIJNDAEL?=dlopen
 	DP_LINK_XMP?=dlopen
@@ -197,7 +203,7 @@ ifeq ($(DP_MAKE_TARGET), bsd)
 	DP_LINK_SDL?=shared
 	DP_LINK_ZLIB?=shared
 	DP_LINK_JPEG?=shared
-	DP_LINK_ODE?=dlopen
+	DP_LINK_ODE?=
 	DP_LINK_CRYPTO?=dlopen
 	DP_LINK_CRYPTO_RIJNDAEL?=dlopen
 	DP_LINK_XMP?=dlopen
@@ -243,7 +249,7 @@ ifeq ($(DP_MAKE_TARGET), mingw)
 	DP_LINK_SDL?=shared
 	DP_LINK_ZLIB?=dlopen
 	DP_LINK_JPEG?=shared
-	DP_LINK_ODE?=dlopen
+	DP_LINK_ODE?=
 	DP_LINK_CRYPTO?=dlopen
 	DP_LINK_CRYPTO_RIJNDAEL?=dlopen
 	DP_LINK_XMP?=dlopen