[Libreoffice-commits] core.git: ios/MobileLibreOffice ios/shared

[Roi Illouz]

 ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj |    8 ++--
 ios/shared/ios_sharedlo.xcodeproj/project.pbxproj                 |   18 ++++++----
 2 files changed, 15 insertions(+), 11 deletions(-)

New commits:
commit d8d0b83435b9a134cd8dd0e92df37b4593bde348
Author: Roi Illouz <roi.illouz at cloudon.com>
Date:   Sun Oct 20 15:51:25 2013 +0300

    Fix breakpoint support for Xcode
    
    Change-Id: Ifd80d9128fdd37f91377ccb48e91db273a5b1770
    Reviewed-on: https://gerrit.libreoffice.org/6358
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
index eebf831..5c04f1f 100644
--- a/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
+++ b/ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
@@ -1538,7 +1538,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				LIBRARY_SEARCH_PATHS = "";
-				LLVM_LTO = YES;
+				LLVM_LTO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
@@ -1579,7 +1579,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				LIBRARY_SEARCH_PATHS = "";
-				LLVM_LTO = YES;
+				LLVM_LTO = NO;
 				OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
@@ -1626,7 +1626,7 @@
 					"$(inherited)",
 					lib_link,
 				);
-				LLVM_LTO = NO;
+				LLVM_LTO = YES;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				WRAPPER_EXTENSION = app;
@@ -1668,7 +1668,7 @@
 				);
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				LIBRARY_SEARCH_PATHS = "";
-				LLVM_LTO = YES;
+				LLVM_LTO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "";
 				SDKROOT = iphoneos;
diff --git a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
index 4a95af1..40adba6 100644
--- a/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
+++ b/ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
@@ -190,6 +190,7 @@
 		688EAAF8180D6773003741B3 /* Config */ = {
 			isa = PBXGroup;
 			children = (
+				68FDBE3018053A140064DD74 /* Supporting Files */,
 				689EBADD1806975D002F1CD7 /* lo.xcconfig */,
 			);
 			name = Config;
@@ -377,7 +378,6 @@
 			children = (
 				689EBB301806D221002F1CD7 /* cxx */,
 				689EBB3B1806D22C002F1CD7 /* objective_c */,
-				68FDBE3018053A140064DD74 /* Supporting Files */,
 			);
 			path = ios_sharedlo;
 			sourceTree = "<group>";
@@ -388,6 +388,7 @@
 				68FDBE3118053A140064DD74 /* ios_sharedlo-Prefix.pch */,
 			);
 			name = "Supporting Files";
+			path = ios_sharedlo;
 			sourceTree = "<group>";
 		};
 		889B7926180FF8DF005A3149 /* role */ = {
@@ -557,7 +558,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				LD_NO_PIE = NO;
 				LINK_WITH_STANDARD_LIBRARIES = NO;
-				LLVM_LTO = YES;
+				LLVM_LTO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				STRIP_INSTALLED_PRODUCT = NO;
@@ -593,7 +594,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				LD_NO_PIE = NO;
 				LINK_WITH_STANDARD_LIBRARIES = NO;
-				LLVM_LTO = YES;
+				LLVM_LTO = NO;
 				SDKROOT = iphoneos;
 				STRIP_INSTALLED_PRODUCT = NO;
 				VALIDATE_PRODUCT = YES;
@@ -605,11 +606,12 @@
 			buildSettings = {
 				DSTROOT = /tmp/ios_sharedlo.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
+				GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ios_sharedlo/ios_sharedlo-Prefix.pch";
 				LD_NO_PIE = NO;
 				LINK_WITH_STANDARD_LIBRARIES = NO;
+				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -622,11 +624,12 @@
 			buildSettings = {
 				DSTROOT = /tmp/ios_sharedlo.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
+				GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ios_sharedlo/ios_sharedlo-Prefix.pch";
 				LD_NO_PIE = NO;
 				LINK_WITH_STANDARD_LIBRARIES = NO;
+				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;
@@ -669,7 +672,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 6.1;
 				LD_NO_PIE = NO;
 				LINK_WITH_STANDARD_LIBRARIES = NO;
-				LLVM_LTO = YES;
+				LLVM_LTO = NO;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
 				STRIP_INSTALLED_PRODUCT = NO;
@@ -681,11 +684,12 @@
 			buildSettings = {
 				DSTROOT = /tmp/ios_sharedlo.dst;
 				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO;
+				GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "ios_sharedlo/ios_sharedlo-Prefix.pch";
 				LD_NO_PIE = NO;
 				LINK_WITH_STANDARD_LIBRARIES = NO;
+				LLVM_LTO = NO;
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SKIP_INSTALL = YES;