diff options
| author | jan Iversen <jani@libreoffice.org> | 2017-04-05 09:30:51 +0200 |
|---|---|---|
| committer | jan Iversen <jani@libreoffice.org> | 2017-04-05 13:17:44 +0200 |
| commit | 12df2eed431b89a2e77d5f5d577daabb04f81edc (patch) | |
| tree | 78237d50271ad6b0f9586a7d6cda277d48e1c08b /ios | |
| parent | f58cff37af294e07938a86900a176984b1e6c655 (diff) | |
iOS make build work with 10.3 and simulator
Solved architecture problem
Change-Id: Ibc6bc5864da5585388862dd92a6039db16c9ccf2
Diffstat (limited to 'ios')
| -rw-r--r-- | ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 14 | ||||
| -rw-r--r-- | ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj | 10 |
2 files changed, 20 insertions, 4 deletions
diff --git a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index 69d042885342..e7209f726fa7 100644 --- a/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/experimental/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -561,7 +561,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + "$(ARCHS_STANDARD)", + i386, + ); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = NO; @@ -579,7 +582,7 @@ SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 3.0; - "VALID_ARCHS[sdk=*]" = arm64; + VALID_ARCHS = "i386 $(ARCHS_STANDARD)"; }; name = Debug; }; @@ -587,7 +590,10 @@ isa = XCBuildConfiguration; baseConfigurationReference = 39B084E21E5F0A9600682A59 /* lo.xcconfig */; buildSettings = { - ARCHS = "$(ARCHS_STANDARD)"; + ARCHS = ( + "$(ARCHS_STANDARD)", + i386, + ); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ENABLE_MODULES = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = NO; @@ -605,7 +611,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; SWIFT_VERSION = 3.0; - "VALID_ARCHS[sdk=*]" = arm64; + VALID_ARCHS = "i386 $(ARCHS_STANDARD)"; }; name = Release; }; diff --git a/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj b/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj index 3ff4146ef291..b18259fcd1ec 100644 --- a/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj +++ b/ios/experimental/Prototype/Prototype.xcodeproj/project.pbxproj @@ -2365,6 +2365,10 @@ BE82BDA518218E2E00A447B5 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + i386, + "$(ARCHS_STANDARD)", + ); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ENABLE_BITCODE = NO; @@ -2372,6 +2376,7 @@ GCC_PREFIX_HEADER = Prototype/Prefix.pch; INFOPLIST_FILE = Prototype/Info.plist; PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = "i386 $(ARCHS_STANDARD)"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -2379,6 +2384,10 @@ BE82BDA618218E2E00A447B5 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ARCHS = ( + i386, + "$(ARCHS_STANDARD)", + ); ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; ENABLE_BITCODE = NO; @@ -2386,6 +2395,7 @@ GCC_PREFIX_HEADER = Prototype/Prefix.pch; INFOPLIST_FILE = Prototype/Info.plist; PRODUCT_NAME = "$(TARGET_NAME)"; + VALID_ARCHS = "i386 $(ARCHS_STANDARD)"; WRAPPER_EXTENSION = app; }; name = Release; |