MultiCraft
/
MultiCraft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iOS: drop iOS 9 support

master
Maksim 2020-11-16 19:04:31 +01:00
parent 67457532d7
commit ab7b1f6c83
8 changed files with 16 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/iOS/MultiCraft/MultiCraft.xcodeproj/project.pbxproj
View File

@ -1788,7 +1788,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_UNROLL_LOOPS = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
STRIP_PNG_TEXT = NO;
@ -1817,7 +1817,7 @@
GCC_SYMBOLS_PRIVATE_EXTERN = YES;
GCC_UNROLL_LOOPS = YES;
GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO;
IPHONEOS_DEPLOYMENT_TARGET = 9.3;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
LLVM_LTO = YES;
SDKROOT = iphoneos;
STRIP_PNG_TEXT = NO;

4
build/iOS/MultiCraft/MultiCraft/Info.plist
View File

@ -20,6 +20,10 @@
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>$(CURRENT_PROJECT_VERSION)</string>
<key>LSApplicationQueriesSchemes</key>
<array>
<string>https</string>
</array>
<key>LSRequiresIPhoneOS</key>
<true/>
<key>MetalCaptureEnabled</key>

24
build/iOS/MultiCraft/MultiCraft/SDVersion/SDVersion.h
View File

@ -16,8 +16,8 @@
typedef NS_ENUM(NSInteger, DeviceVersion){
Simulator = 1,
// iPhone
iPhone4S = 101,
iPhone5 = 102,
iPhone5C = 103,
iPhone5S = 104,
@ -44,9 +44,6 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
iPhone12ProMax = 125,
// iPad
iPad2 = 201,
iPadMini = 202,
iPad3 = 203,
iPad4 = 204,
iPadAir = 205,
iPadMini2 = 206,
@ -70,7 +67,6 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
iPadAir4 = 219,
// iPod Touch
iPodTouch5Gen = 301,
iPodTouch6Gen = 302,
iPodTouch7Gen = 303
};
@ -92,9 +88,6 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
@"x86_64" : @(Simulator),
// iPhone
@"iPhone4,1" : @(iPhone4S),
@"iPhone4,2" : @(iPhone4S),
@"iPhone4,3" : @(iPhone4S),
@"iPhone5,1" : @(iPhone5),
@"iPhone5,2" : @(iPhone5),
@"iPhone5,3" : @(iPhone5C),
@ -130,13 +123,6 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
@"iPhone13,4" : @(iPhone12ProMax),
// iPad
@"iPad2,1" : @(iPad2),
@"iPad2,2" : @(iPad2),
@"iPad2,3" : @(iPad2),
@"iPad2,4" : @(iPad2),
@"iPad3,1" : @(iPad3),
@"iPad3,2" : @(iPad3),
@"iPad3,3" : @(iPad3),
@"iPad3,4" : @(iPad4),
@"iPad3,5" : @(iPad4),
@"iPad3,6" : @(iPad4),
@ -159,9 +145,6 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
@"iPad13,1" : @(iPadAir4),
@"iPad13,2" : @(iPadAir4),
@"iPad2,5" : @(iPadMini),
@"iPad2,6" : @(iPadMini),
@"iPad2,7" : @(iPadMini),
@"iPad4,4" : @(iPadMini2),
@"iPad4,5" : @(iPadMini2),
@"iPad4,6" : @(iPadMini2),
@ -195,7 +178,6 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
@"iPad8,12" : @(iPadPro12Dot9Inch4Gen),
// iPod
@"iPod5,1" : @(iPodTouch5Gen),
@"iPod7,1" : @(iPodTouch6Gen),
@"iPod9,1" : @(iPodTouch7Gen)};
});
@ -213,7 +195,7 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
@end
#define SDVersion4Inch (([SDVersion deviceVersion] == iPhone5) || ([SDVersion deviceVersion] == iPhone5C) || ([SDVersion deviceVersion] == iPhone5S) || ([SDVersion deviceVersion] == iPhoneSE) || \
([SDVersion deviceVersion] == iPodTouch5Gen) || ([SDVersion deviceVersion] == iPodTouch6Gen) || ([SDVersion deviceVersion] == iPodTouch7Gen))
([SDVersion deviceVersion] == iPodTouch6Gen) || ([SDVersion deviceVersion] == iPodTouch7Gen))
#define SDVersion4and7Inch (([SDVersion deviceVersion] == iPhone6) || ([SDVersion deviceVersion] == iPhone6S) || ([SDVersion deviceVersion] == iPhone7) || ([SDVersion deviceVersion] == iPhone8) || ([SDVersion deviceVersion] == iPhoneSE2Gen))
@ -225,7 +207,7 @@ typedef NS_ENUM(NSInteger, DeviceVersion){
#define SDVersion6and5Inch (([SDVersion deviceVersion] == iPhoneXSMax) || ([SDVersion deviceVersion] == iPhone11ProMax) | ([SDVersion deviceVersion] == iPhone12ProMax))
#define SDVersion7and9Inch (([SDVersion deviceVersion] == iPadMini) || ([SDVersion deviceVersion] == iPadMini2) | ([SDVersion deviceVersion] == iPadMini3) | ([SDVersion deviceVersion] == iPadMini4) | ([SDVersion deviceVersion] == iPadMini5))
#define SDVersion7and9Inch (([SDVersion deviceVersion] == iPadMini2) | ([SDVersion deviceVersion] == iPadMini3) | ([SDVersion deviceVersion] == iPadMini4) | ([SDVersion deviceVersion] == iPadMini5))
//#define SDVersion11Inch (([SDVersion deviceVersion] == iPadPro11Inch) || ([SDVersion deviceVersion] == iPadPro11Inch2Gen) || ([SDVersion deviceVersion] == iPadAir4))

6
build/iOS/MultiCraft/MultiCraft/UI/ConsentAlertViewController.swift
View File

@ -106,7 +106,7 @@ final class ConsentAlertViewController: BasePresentViewController, NantesLabelDe
@IBAction private func showMulticraftUses(_ sender: Any) {
if UIApplication.shared.canOpenURL(privacyURL) {
UIApplication.shared.openURL(privacyURL)
UIApplication.shared.open(privacyURL)
}
}
@ -122,7 +122,7 @@ final class ConsentAlertViewController: BasePresentViewController, NantesLabelDe
@IBAction private func showPrivacy(_ sender: Any) {
if UIApplication.shared.canOpenURL(privacyURL) {
UIApplication.shared.openURL(privacyURL)
UIApplication.shared.open(privacyURL)
}
}
@ -150,7 +150,7 @@ final class ConsentAlertViewController: BasePresentViewController, NantesLabelDe
func attributedLabel(_ label: NantesLabel, didSelectLink link: URL) {
if UIApplication.shared.canOpenURL(link) {
UIApplication.shared.openURL(link)
UIApplication.shared.open(link)
}
}
}

2
build/iOS/Podfile
View File

@ -33,7 +33,7 @@ post_install do |installer|
config.build_settings['GCC_UNROLL_LOOPS'] = 'YES'
config.build_settings['LLVM_LTO'] = 'YES'
config.build_settings['ENABLE_BITCODE'] = 'NO'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '9.3'
config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '10.3'
config.build_settings['OTHER_CFLAGS'] = ['$(inherited)', '-fvisibility-inlines-hidden', '-fdata-sections', '-ffunction-sections', '-fno-unwind-tables', '-fno-asynchronous-unwind-tables']
config.build_settings['OTHER_CPLUSPLUSFLAGS'] = ['$(inherited)', '$(OTHER_CFLAGS)']
config.build_settings['OTHER_LDFLAGS'] = ['$(inherited)', '-Wl,-dead_strip']

1
build/iOS/deps/openal.sh
View File

@ -17,7 +17,6 @@ cmake -S . -GXcode \
-DALSOFT_OSX_FRAMEWORK=ON -DALSOFT_EMBED_HRTF_DATA=YES -DALSOFT_UTILS=OFF \
-DALSOFT_EXAMPLES=OFF -DALSOFT_INSTALL=OFF -DALSOFT_BACKEND_WAVE=NO \
-DCMAKE_C_FLAGS_RELEASE="$IOS_FLAGS" -DCMAKE_CXX_FLAGS_RELEASE="$IOS_FLAGS" \
-DCMAKE_OSX_DEPLOYMENT_TARGET=9.3 \
-B build_arm "-DCMAKE_OSX_ARCHITECTURES=armv7;arm64"
cmake --build build_arm --config Release --target OpenAL

2
build/iOS/deps/sdk.sh
View File

@ -2,7 +2,7 @@
# This file sets the appropiate compiler and flags for compiling for iOS without XCode
sdk=iphoneos
osver=9.3
osver=10.3
export IOS_COMPILER=$(xcrun --sdk $sdk --find clang)
export IOS_CC=$IOS_COMPILER

7
src/defaultsettings.cpp
View File

@ -531,10 +531,7 @@ void set_default_settings(Settings *settings) {
settings->setDefault("fallback_font_path", g_settings->get("font_path"));
// Set the size of the elements depending on the screen size
if ([SDVersion deviceVersion] == iPhone4S) {
// 3.5" iPhone
settings->setDefault("hud_scaling", "0.5");
} else if SDVersion4Inch {
if SDVersion4Inch {
// 4" iPhone and iPod Touch
settings->setDefault("hud_scaling", "0.55");
settings->setDefault("mouse_sensitivity", "0.33");
@ -578,6 +575,6 @@ void set_default_settings(Settings *settings) {
void override_default_settings(Settings *settings, Settings *from) {
std::vector<std::string> names = from->getNames();
for (const auto & name : names)
for (const auto &name : names)
settings->setDefault(name, from->get(name));
}