diff --git a/CMakeLists.txt b/CMakeLists.txt index cd6e47e7ad..8cec0f281d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -378,8 +378,9 @@ if(NOT MSVC) endif() if(IOS) + set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0") elseif(APPLE AND NOT CMAKE_CROSSCOMPILING) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8") + set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++ -U__STRICT_ANSI__") set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") elseif(NOT ANDROID) @@ -2456,7 +2457,7 @@ if(NOT ANDROID) endif() # packaging and code signing if(IOS) - set(DEPLOYMENT_TARGET 8.0) + set(DEPLOYMENT_TARGET 11.0) file(GLOB IOSAssets ios/assets/*.png) list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@2x.png) list(REMOVE_ITEM IOSAssets ${CMAKE_CURRENT_SOURCE_DIR}/ios/assets/Default-568h@3x.png) diff --git a/cmake/Toolchains/ios.cmake b/cmake/Toolchains/ios.cmake index 4198706e0c..45a8a219bc 100644 --- a/cmake/Toolchains/ios.cmake +++ b/cmake/Toolchains/ios.cmake @@ -12,7 +12,7 @@ # PPSSPP platform flags set(MOBILE_DEVICE ON) set(USING_GLES2 ON) -set(IPHONEOS_DEPLOYMENT_TARGET 6.0) +set(IPHONEOS_DEPLOYMENT_TARGET 11.0) add_definitions( -DGL_ETC1_RGB8_OES=0 -U__STRICT_ANSI__ @@ -27,7 +27,7 @@ set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++") # Standard settings set(CMAKE_SYSTEM_NAME Darwin) set(CMAKE_SYSTEM_VERSION 1) -set(CMAKE_SYSTEM_PROCESSOR armv7) +set(CMAKE_SYSTEM_PROCESSOR aarch64) set(IOS ON) set(CMAKE_CROSSCOMPILING ON) set(CMAKE_MACOSX_BUNDLE YES) @@ -66,9 +66,7 @@ set(CMAKE_OSX_SYSROOT ${CMAKE_IOS_SDK_ROOT} CACHE PATH "Sysroot used for iOS sup # set the architecture for iOS if(IOS_PLATFORM STREQUAL "OS") - # When ffmpeg has been rebuilt for arm64 use: - set(IOS_ARCH "armv7;arm64") - #set(IOS_ARCH "armv7") + set(IOS_ARCH "arm64") else() set(IOS_ARCH "i386;x86_64") endif() @@ -95,4 +93,3 @@ set(CMAKE_SYSTEM_FRAMEWORK_PATH # only search the iOS sdks, not the remainder of the host filesystem set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY) set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) -