summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTwinaphex2017-09-29 19:17:09 +0200
committerGitHub2017-09-29 19:17:09 +0200
commitfe24f89f471b6c8d74948f56a387906c29eceb80 (patch)
tree9c38aeeb0a4762fc7e7155f0b5b74d6e7217a5ef
parent04c179c85e266cb60c1135eb6c9cc6e7af2bb8de (diff)
parentafb8f91a4ff0dc8977d08c99f612f698e3e083cb (diff)
downloadsnes9x2002-fe24f89f471b6c8d74948f56a387906c29eceb80.tar.gz
snes9x2002-fe24f89f471b6c8d74948f56a387906c29eceb80.tar.bz2
snes9x2002-fe24f89f471b6c8d74948f56a387906c29eceb80.zip
Merge pull request #19 from yoshisuga/master
support for iOS arm64 build
-rw-r--r--Makefile12
1 files changed, 9 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index e4c4dc3..e39c6d4 100644
--- a/Makefile
+++ b/Makefile
@@ -30,12 +30,18 @@ else ifneq (,$(findstring ios,$(platform)))
ifeq ($(IOSSDK),)
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
endif
- CC = cc -arch armv7 -isysroot $(IOSSDK)
- CXX = c++ -arch armv7 -isysroot $(IOSSDK)
+
+ ifeq ($(platform),ios-arm64)
+ CC = cc -arch arm64 -isysroot $(IOSSDK)
+ CXX = c++ -arch arm64 -isysroot $(IOSSDK)
+ else
+ CC = cc -arch armv7 -isysroot $(IOSSDK)
+ CXX = c++ -arch armv7 -isysroot $(IOSSDK)
+ endif
ARM_ASM = 0
ASM_CPU = 0
ASM_SPC700 = 0
- ifeq ($(platform),ios9)
+ ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
CC += -miphoneos-version-min=8.0
CXX += -miphoneos-version-min=8.0
PLATFORM_DEFINES := -miphoneos-version-min=8.0