summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTwinaphex2017-10-03 05:21:13 +0200
committerGitHub2017-10-03 05:21:13 +0200
commit5d1ae429e1e4a9b29a02d332b8dd3f1b42b0904e (patch)
tree89c57997ecce6816d7df5949a1b52fc8d4836fbe
parentc31b3e857c2c747a9b0ddc3632f72b84182e76a7 (diff)
parent0b73fbaa1a5c5146edab4aa6d6ba07ad11c75079 (diff)
downloadpicogpsp-5d1ae429e1e4a9b29a02d332b8dd3f1b42b0904e.tar.gz
picogpsp-5d1ae429e1e4a9b29a02d332b8dd3f1b42b0904e.tar.bz2
picogpsp-5d1ae429e1e4a9b29a02d332b8dd3f1b42b0904e.zip
Merge pull request #40 from yoshisuga/master
support for iOS arm64 build
-rw-r--r--Makefile8
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index d0d8b7d..1f6c380 100644
--- a/Makefile
+++ b/Makefile
@@ -126,9 +126,13 @@ else ifneq (,$(findstring ios,$(platform)))
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
endif
- CC = cc -arch armv7 -isysroot $(IOSSDK)
+ ifeq ($(platform),ios-arm64)
+ CC = cc -arch arm64 -isysroot $(IOSSDK)
+ else
+ CC = cc -arch armv7 -isysroot $(IOSSDK)
+ endif
CFLAGS += -DIOS -DHAVE_POSIX_MEMALIGN -marm
-ifeq ($(platform),ios9)
+ifeq ($(platform),$(filter $(platform),ios9 ios-arm64))
CC += -miphoneos-version-min=8.0
CFLAGS += -miphoneos-version-min=8.0
else