iOS, add support for arm64
Added general support for arm64 Removed experimental/prototype from normal build Change-Id: I832256c72fbd408084bc802440343c874e7e6d28
This commit is contained in:
parent
1e30c98eec
commit
25a09c8776
4 changed files with 16 additions and 7 deletions
4
config.sub
vendored
4
config.sub
vendored
|
@ -253,7 +253,7 @@ case $basic_machine in
|
|||
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
|
||||
| am33_2.0 \
|
||||
| arc | arceb \
|
||||
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
|
||||
| arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
|
||||
| avr | avr32 \
|
||||
| be32 | be64 \
|
||||
| bfin \
|
||||
|
@ -369,7 +369,7 @@ case $basic_machine in
|
|||
| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
|
||||
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
|
||||
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
|
||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
|
||||
| arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
|
||||
| avr-* | avr32-* \
|
||||
| be32-* | be64-* \
|
||||
| bfin-* | bs2000-* \
|
||||
|
|
|
@ -12,7 +12,6 @@ ifeq ($(OS),IOS)
|
|||
|
||||
$(eval $(call gb_Module_add_targets,ios,\
|
||||
CustomTarget_Lo_Xcconfig \
|
||||
CustomTarget_Prototype_app \
|
||||
CustomTarget_LibreOfficeLight_app \
|
||||
))
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 46;
|
||||
objectVersion = 48;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
|
@ -300,7 +300,7 @@
|
|||
};
|
||||
};
|
||||
buildConfigurationList = 397E08F51E597BD8001374E0 /* Build configuration list for PBXProject "LibreOfficeLight" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
compatibilityVersion = "Xcode 8.0";
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
|
@ -596,6 +596,16 @@
|
|||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||
GCC_PREFIX_HEADER = "LibreOfficeLight/LibreOfficeLight-Prefix.pch";
|
||||
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
|
||||
"HEADER_SEARCH_PATHS[arch=*]" = (
|
||||
"$(inherited)",
|
||||
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
|
||||
"$(LO_BUILDDIR)/config_host",
|
||||
"$(LO_SRCDIR)/include",
|
||||
"$(LO_WORKDIR)/UnoApiHeadersTarget/udkapi/comprehensive",
|
||||
"$(LO_WORKDIR)/UnoApiHeadersTarget/offapi/comprehensive",
|
||||
"$(LO_WORKDIR)/UnpackedTarball/icu/source/common",
|
||||
"$(LO_WORKDIR)/ios/generated",
|
||||
);
|
||||
INFOPLIST_FILE = LibreOfficeLight/Info.plist;
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
|
||||
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 46;
|
||||
objectVersion = 48;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
|
@ -2175,7 +2175,7 @@
|
|||
LastUpgradeCheck = 0500;
|
||||
};
|
||||
buildConfigurationList = BE82BD6D18218E2E00A447B5 /* Build configuration list for PBXProject "Prototype" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
compatibilityVersion = "Xcode 8.0";
|
||||
developmentRegion = English;
|
||||
hasScannedForEncodings = 0;
|
||||
knownRegions = (
|
||||
|
|
Loading…
Reference in a new issue