Skip to content

Commit

Permalink
Switch to iOS 9.0 where applicable
Browse files Browse the repository at this point in the history
  • Loading branch information
misl6 committed Apr 18, 2021
1 parent 0ef85dc commit 0e1aef4
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 8 deletions.
2 changes: 1 addition & 1 deletion kivy_ios/recipes/hostlibffi/libffi-xcode10.patch
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@
darwin_ios/include,
);
- IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 8.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 9.0;
"IPHONEOS_DEPLOYMENT_TARGET[arch=arm64]" = 7.0;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = ffi;
Expand Down
3 changes: 1 addition & 2 deletions kivy_ios/recipes/libffi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ class LibffiRecipe(Recipe):
def prebuild_arch(self, arch):
if self.has_marker("patched"):
return
# XCode 10 minimum is 8.0 now.
shprint(sh.sed,
"-i.bak",
"s/-miphoneos-version-min=5.1.1/-miphoneos-version-min=8.0/g",
"s/-miphoneos-version-min=5.1.1/-miphoneos-version-min=9.0/g",
"generate-darwin-source-and-headers.py")
self.apply_patch("fix-win32-unreferenced-symbol.patch")
self.apply_patch("generate-darwin-source-and-headers-python3-items.patch")
Expand Down
4 changes: 2 additions & 2 deletions kivy_ios/toolchain.py
Original file line number Diff line number Diff line change
Expand Up @@ -246,15 +246,15 @@ class Arch64Simulator(Arch):
sdk = "iphonesimulator"
arch = "x86_64"
triple = "x86_64-apple-darwin13"
version_min = "-miphoneos-version-min=8.0"
version_min = "-miphoneos-version-min=9.0"
sysroot = sh.xcrun("--sdk", "iphonesimulator", "--show-sdk-path").strip()


class Arch64IOS(Arch):
sdk = "iphoneos"
arch = "arm64"
triple = "aarch64-apple-darwin13"
version_min = "-miphoneos-version-min=8.0"
version_min = "-miphoneos-version-min=9.0"
sysroot = sh.xcrun("--sdk", "iphoneos", "--show-sdk-path").strip()


Expand Down
2 changes: 1 addition & 1 deletion kivy_ios/tools/liblink
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ if 'arm' in arch:
min_version_flag = '-ios_version_min'
else:
min_version_flag = '-ios_simulator_version_min'
call = [ld, '-r', '-o', output + '.o', min_version_flag, '8.0', '-arch', arch]
call = [ld, '-r', '-o', output + '.o', min_version_flag, '9.0', '-arch', arch]
if min_version_flag == "-ios_version_min":
call += ["-bitcode_bundle"]
call += objects
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@
"{{ cookiecutter.dist_dir }}/include/common/sdl2",
);
INFOPLIST_FILE = "{{ cookiecutter.project_name }}-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"{{ cookiecutter.dist_dir }}/lib",
Expand Down Expand Up @@ -326,7 +326,7 @@
"{{ cookiecutter.dist_dir }}/include/common/sdl2",
);
INFOPLIST_FILE = "{{ cookiecutter.project_name }}-Info.plist";
IPHONEOS_DEPLOYMENT_TARGET = 8.1;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"{{ cookiecutter.dist_dir }}/lib",
Expand Down

0 comments on commit 0e1aef4

Please sign in to comment.