Skip to content

Commit e7fcfef

Browse files
Merge pull request #15 from warmenhoven/warmenhoven/pr/ios
Fix setting sdk for ios-arm64 and tvos-arm64
2 parents 45edc82 + 5cc37c1 commit e7fcfef

1 file changed

Lines changed: 17 additions & 13 deletions

File tree

Makefile

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,30 @@ else ifeq ($(platform), tvos-arm64)
7474
ifeq ($(IOSSDK),)
7575
IOSSDK := $(shell xcodebuild -version -sdk appletvos Path)
7676
endif
77+
CC = cc -arch arm64 -isysroot $(IOSSDK)
78+
LD = cc -arch arm64 -isysroot $(IOSSDK)
7779
else ifneq (,$(findstring ios,$(platform)))
7880
TARGET := $(TARGET_NAME)_libretro_ios.dylib
7981
fpic := -fPIC
8082
SHARED := -dynamiclib
8183

82-
ifeq ($(IOSSDK),)
83-
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
84-
endif
84+
ifeq ($(IOSSDK),)
85+
IOSSDK := $(shell xcodebuild -version -sdk iphoneos Path)
86+
endif
8587

86-
DEFINES := -DIOS
87-
CC = cc -arch armv7 -isysroot $(IOSSDK)
88-
LD = cc -arch armv7 -isysroot $(IOSSDK)
88+
DEFINES := -DIOS
8989

90-
ifeq ($(platform),ios9)
91-
CC += -miphoneos-version-min=8.0
92-
CXXFLAGS += -miphoneos-version-min=8.0
93-
else
94-
CC += -miphoneos-version-min=5.0
95-
CXXFLAGS += -miphoneos-version-min=5.0
96-
endif
90+
ifeq ($(platform),ios9)
91+
CC = cc -arch armv7 -isysroot $(IOSSDK)
92+
LD = cc -arch armv7 -isysroot $(IOSSDK)
93+
CC += -miphoneos-version-min=8.0
94+
CXXFLAGS += -miphoneos-version-min=8.0
95+
else
96+
CC = cc -arch arm64 -isysroot $(IOSSDK)
97+
LD = cc -arch arm64 -isysroot $(IOSSDK)
98+
CC += -miphoneos-version-min=5.0
99+
CXXFLAGS += -miphoneos-version-min=5.0
100+
endif
97101

98102
# Nintendo Game Cube
99103
else ifeq ($(platform), ngc)

0 commit comments

Comments
 (0)