From a53a821ec3f7bacddf9318d3a9f2c1ba68cc5e5a Mon Sep 17 00:00:00 2001
From: hendricks266 <hendricks266@1a8010ca-5511-0410-912e-c29ae57300e0>
Date: Sun, 5 Jun 2016 04:46:01 +0000
Subject: [PATCH] Makefile: Switch the detection order of OPTOPT flags so that
 i386 is checked after x86_64. This ensures full compatibility for fat OS X
 binaries built using ARCH="-arch i386 -arch x86_64".

git-svn-id: https://svn.eduke32.com/eduke32@5766 1a8010ca-5511-0410-912e-c29ae57300e0
---
 polymer/eduke32/Makefile.common | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/polymer/eduke32/Makefile.common b/polymer/eduke32/Makefile.common
index 9f47ed195..3aa4cabf0 100644
--- a/polymer/eduke32/Makefile.common
+++ b/polymer/eduke32/Makefile.common
@@ -389,6 +389,11 @@ else
 endif
 
 ifndef OPTOPT
+    ifeq ($(findstring x86_64, $(IMPLICIT_ARCH)),x86_64)
+        ifeq ($(PLATFORM),DARWIN)
+            OPTOPT=-march=core2 -mmmx -msse -msse2 -msse3 -mssse3
+        endif
+    endif
     ifeq ($(findstring i386, $(IMPLICIT_ARCH)),i386)
         ifeq ($(PLATFORM),DARWIN)
             OPTOPT=-march=nocona -mmmx -msse -msse2 -msse3
@@ -397,11 +402,6 @@ ifndef OPTOPT
             # -msse2 -mfpmath=sse,387 -malign-double $(M_STACKREALIGN)
         endif
     endif
-    ifeq ($(findstring x86_64, $(IMPLICIT_ARCH)),x86_64)
-        ifeq ($(PLATFORM),DARWIN)
-            OPTOPT=-march=core2 -msse3 -mssse3
-        endif
-    endif
 endif
 
 ifneq (0,$(KRANDDEBUG))