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
This commit is contained in:
hendricks266 2016-06-05 04:46:01 +00:00
parent 400abee8b1
commit a53a821ec3

View file

@ -389,6 +389,11 @@ else
endif endif
ifndef OPTOPT 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 ($(findstring i386, $(IMPLICIT_ARCH)),i386)
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
OPTOPT=-march=nocona -mmmx -msse -msse2 -msse3 OPTOPT=-march=nocona -mmmx -msse -msse2 -msse3
@ -397,11 +402,6 @@ ifndef OPTOPT
# -msse2 -mfpmath=sse,387 -malign-double $(M_STACKREALIGN) # -msse2 -mfpmath=sse,387 -malign-double $(M_STACKREALIGN)
endif endif
endif endif
ifeq ($(findstring x86_64, $(IMPLICIT_ARCH)),x86_64)
ifeq ($(PLATFORM),DARWIN)
OPTOPT=-march=core2 -msse3 -mssse3
endif
endif
endif endif
ifneq (0,$(KRANDDEBUG)) ifneq (0,$(KRANDDEBUG))