Kaydet (Commit) 8cd7e7df authored tarafından jan Iversen's avatar jan Iversen

iOS update to 11.0

Starting to use 11.0 features

Change-Id: I0e147c0b436a93d11f220b533a5b2091f7cb56fc
üst 77663321
......@@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds:
* Runtime: RHEL 6 or CentOS 6
* Build: GCC 4.8.1 or Clang
* iOS (only for LibreOfficeKit):
* Runtime: 10.3 (only support for newer i devices == 64 bit)
* Build: Xcode 9.0 and iPhone SDK 10.3
* Runtime: 11.0 (only support for newer i devices == 64 bit)
* Build: Xcode 9.0 and iPhone SDK 11.0
If you want to use Clang with the LibreOffice compiler plugins, the minimal
version of Clang is 3.4. Since Xcode doesn't provide the compiler plugin
......
......@@ -2868,8 +2868,8 @@ if test $_os = iOS; then
fi
xcode_developer=`xcode-select -print-path`
current_sdk_ver=10.3
for sdkver in 11.0 10.3; do
current_sdk_ver=11.0
for sdkver in 11.0; do
t=$xcode_developer/Platforms/$platform.platform/Developer/SDKs/$platform$sdkver.sdk
if test -d $t; then
ios_sdk=$sdkver
......
......@@ -198,14 +198,14 @@
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
"$(LO_SRCDIR)/ios/generated",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_MAP_FILE_PATH = ./iosKit.map;
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv";
PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv";
SDKROOT = iphoneos;
VALID_ARCHS = "x86_64 arm64";
};
......@@ -265,14 +265,14 @@
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
"$(LO_SRCDIR)/ios/generated",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_GENERATE_MAP_FILE = YES;
LD_MAP_FILE_PATH = ./iosKit.map;
LD_QUOTE_LINKER_ARGUMENTS_FOR_COMPILER_DRIVER = NO;
MACH_O_TYPE = staticlib;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = YES;
PRELINK_FLAGS = "-Wl -ios_version_min 10.3 -lz -liconv";
PRELINK_FLAGS = "-Wl -ios_version_min 11.0 -lz -liconv";
SDKROOT = iphoneos;
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "x86_64 arm64";
......@@ -285,7 +285,7 @@
buildSettings = {
MACH_O_TYPE = staticlib;
OTHER_LDFLAGS = "";
PRELINK_FLAGS = "-ios_version_min 10.3";
PRELINK_FLAGS = "-ios_version_min 11.0";
PRELINK_LIBS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
......@@ -298,7 +298,7 @@
buildSettings = {
MACH_O_TYPE = staticlib;
OTHER_LDFLAGS = "";
PRELINK_FLAGS = "-ios_version_min 10.3";
PRELINK_FLAGS = "-ios_version_min 11.0";
PRELINK_LIBS = "";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
......
......@@ -360,7 +360,7 @@
"$(LO_SRCDIR)/ios/generated",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
......@@ -438,7 +438,7 @@
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
"$(LO_SRCDIR)/ios/generated",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = NO;
ONLY_ACTIVE_ARCH = NO;
......@@ -478,7 +478,7 @@
"$(LO_WORKDIR)/ios/generated",
);
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
......@@ -508,7 +508,7 @@
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "LibreOfficeLight/LibreOfficeLight-Prefix.pch";
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
......@@ -591,7 +591,7 @@
"$(LO_SRCDIR)/ios/generated",
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
);
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MACH_O_TYPE = mh_execute;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
......@@ -631,7 +631,7 @@
"$(LO_WORKDIR)/ios/generated",
);
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "$(LINK_LDFLAGS)";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment