diff options
author | jan Iversen <jani@libreoffice.org> | 2017-10-08 12:33:33 +0200 |
---|---|---|
committer | jan Iversen <jani@libreoffice.org> | 2017-10-08 12:39:00 +0200 |
commit | e45c4f68ed45856285abb88543a41496875d9566 (patch) | |
tree | c909fc85869c1e3ca320e4c488e2b6eb6020ea00 /ios | |
parent | f0836b511f01beec873735185b21f7d2d6bd5095 (diff) |
iOS, add simulator configuration to app
LibreOfficeLight can now be generated as:
Release (target arm64 == production)
Debug (target arm64 == debug on real hw)
Simulator (target x86_64 == debug in simulator)
Change-Id: I8742946571fb0268c9c83f32de5b6c0093624ebe
Diffstat (limited to 'ios')
-rw-r--r-- | ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj | 127 | ||||
-rw-r--r-- | ios/loApp.xcconfig.in | 11 |
2 files changed, 136 insertions, 2 deletions
diff --git a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj index bb17d65ddccc..90196126a17b 100644 --- a/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeLight/LibreOfficeLight.xcodeproj/project.pbxproj @@ -509,6 +509,127 @@ }; name = Release; }; + 39ACF41A1F8A358000DA7334 /* Simulator */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 39ACF4181F8A317600DA7334 /* loApp.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + HEADER_SEARCH_PATHS = ( + "$(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_SRCDIR)/ios/generated", + "$(LO_WORKDIR)/UnpackedTarball/icu/source/common", + ); + "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_SRCDIR)/ios/generated", + "$(LO_WORKDIR)/UnpackedTarball/icu/source/common", + ); + IPHONEOS_DEPLOYMENT_TARGET = 10.3; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ( + "$(LINK_LDFLAGS)", + "-lstdc++", + ); + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + TARGETED_DEVICE_FAMILY = "1,2"; + VALID_ARCHS = "arm64 x86_64"; + }; + name = Simulator; + }; + 39ACF41B1F8A358000DA7334 /* Simulator */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CLANG_WARN_DOCUMENTATION_COMMENTS = NO; + CLANG_WARN_INFINITE_RECURSION = NO; + CODE_SIGN_ENTITLEMENTS = LibreOfficeLight/LibreOfficeLight.entitlements; + DEVELOPMENT_TEAM = TM977DU7EF; + ENABLE_TESTABILITY = NO; + 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"; + ONLY_ACTIVE_ARCH = NO; + OTHER_LDFLAGS = "$(LINK_LDFLAGS)"; + PRODUCT_BUNDLE_IDENTIFIER = com.jani.Editors.LibreOfficeLight; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "LibreOfficeLight/lokit-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_SWIFT3_OBJC_INFERENCE = On; + SWIFT_VERSION = 4.0; + TARGETED_DEVICE_FAMILY = 2; + VALID_ARCHS = "arm64 x86_64"; + }; + name = Simulator; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -516,19 +637,21 @@ isa = XCConfigurationList; buildConfigurations = ( 397E09231E597BD8001374E0 /* Debug */, + 39ACF41A1F8A358000DA7334 /* Simulator */, 397E09241E597BD8001374E0 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Simulator; }; 397E09251E597BD8001374E0 /* Build configuration list for PBXNativeTarget "LibreOfficeLight" */ = { isa = XCConfigurationList; buildConfigurations = ( 397E09261E597BD8001374E0 /* Debug */, + 39ACF41B1F8A358000DA7334 /* Simulator */, 397E09271E597BD8001374E0 /* Release */, ); defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; + defaultConfigurationName = Simulator; }; /* End XCConfigurationList section */ }; diff --git a/ios/loApp.xcconfig.in b/ios/loApp.xcconfig.in index dba31a09691d..fb3426dd4df8 100644 --- a/ios/loApp.xcconfig.in +++ b/ios/loApp.xcconfig.in @@ -14,3 +14,14 @@ OTHER_CFLAGS = @CFLAGS@ OTHER_CPLUSPLUSFLAGS = @CPLUSPLUSFLAGS@ SYMROOT = @SYMROOT@ +//:configuration = Debug +LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64_debug.a + +//:configuration = Release +LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_ARM64.a + +//:configuration = Simulator +LINK_LDFLAGS= $(LO_SRCDIR)/ios/generated/libLibreOfficeKit_X86_64_debug.a + +//:completeSettings = some + |