include/LibreOfficeKit/LibreOfficeKitInit.h | 6 +++--- ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-)
New commits: commit b9866cb282f4f21c43b9c6b119710460dba7ddbd Author: jan Iversen <[email protected]> Date: Tue Oct 17 13:59:57 2017 +0200 iOS, changed define to IOS TARGET_OS_IPHONE not defined, but IOS are. Change-Id: I5a12b0cb386b8968101264f8fb17d745e5c1790f diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h index 73e2bbb83dfd..f9610f1f02fc 100644 --- a/include/LibreOfficeKit/LibreOfficeKitInit.h +++ b/include/LibreOfficeKit/LibreOfficeKitInit.h @@ -42,7 +42,7 @@ extern "C" #endif #define SEPARATOR '/' -#if !defined(TARGET_OS_IPHONE) +#if !defined(IOS) static void *lok_loadlib(const char *pFN) { return dlopen(pFN, RTLD_LAZY @@ -68,7 +68,7 @@ extern "C" { (void)pPath; } -#endif // TARGET_OS_IPHONE +#endif // IOS static void *lok_dlsym(void *Hnd, const char *pName) { @@ -169,7 +169,7 @@ static void *lok_dlopen( const char *install_path, char ** _imp_lib ) char *imp_lib; void *dlhandle; -#if !defined(TARGET_OS_IPHONE) +#if !defined(IOS) size_t partial_length, imp_lib_size; struct stat dir_st; commit ebb5c71c80f410d624313805a3073ea21be6ca12 Author: jan Iversen <[email protected]> Date: Tue Oct 17 09:54:40 2017 +0200 iOS, added extra linker options for kit Change-Id: I348e7a717eb6939213ce1cb3881cbba6b76578c8 diff --git a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj index 69faf4fb80a9..82fa34fb22ed 100644 --- a/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj +++ b/ios/LibreOfficeKit/LibreOfficeKit.xcodeproj/project.pbxproj @@ -198,6 +198,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.3; 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"; @@ -262,6 +264,8 @@ IPHONEOS_DEPLOYMENT_TARGET = 10.3; 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"; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
