mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix breakpoint support for Xcode

Browse Source 
Change-Id: Ifd80d9128fdd37f91377ccb48e91db273a5b1770
Reviewed-on: https://gerrit.libreoffice.org/6358
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Roi Illouz
2013-10-20 15:51:25 +03:00
committed by Tor Lillqvist
parent 288f0029c6
commit d8d0b83435
2 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ios/MobileLibreOffice/MobileLibreOffice.xcodeproj/project.pbxproj
View File

@@ -1538,7 +1538,7 @@
); );
IPHONEOS_DEPLOYMENT_TARGET = 6.1; IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
LLVM_LTO = YES; LLVM_LTO = NO;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@@ -1579,7 +1579,7 @@
); );
IPHONEOS_DEPLOYMENT_TARGET = 6.1; IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
LLVM_LTO = YES; LLVM_LTO = NO;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
SDKROOT = iphoneos; SDKROOT = iphoneos;
@@ -1626,7 +1626,7 @@
"$(inherited)", "$(inherited)",
lib_link, lib_link,
); );
LLVM_LTO = NO; LLVM_LTO = YES;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app; WRAPPER_EXTENSION = app;
@@ -1668,7 +1668,7 @@
); );
IPHONEOS_DEPLOYMENT_TARGET = 6.1; IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LIBRARY_SEARCH_PATHS = ""; LIBRARY_SEARCH_PATHS = "";
LLVM_LTO = YES; LLVM_LTO = NO;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = ""; OTHER_LDFLAGS = "";
SDKROOT = iphoneos; SDKROOT = iphoneos;

18
ios/shared/ios_sharedlo.xcodeproj/project.pbxproj
View File

@@ -190,6 +190,7 @@
688EAAF8180D6773003741B3 /* Config */ = { 688EAAF8180D6773003741B3 /* Config */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
68FDBE3018053A140064DD74 /* Supporting Files */,
689EBADD1806975D002F1CD7 /* lo.xcconfig */, 689EBADD1806975D002F1CD7 /* lo.xcconfig */,
); );
name = Config; name = Config;
@@ -377,7 +378,6 @@
children = ( children = (
689EBB301806D221002F1CD7 /* cxx */, 689EBB301806D221002F1CD7 /* cxx */,
689EBB3B1806D22C002F1CD7 /* objective_c */, 689EBB3B1806D22C002F1CD7 /* objective_c */,
68FDBE3018053A140064DD74 /* Supporting Files */,
); );
path = ios_sharedlo; path = ios_sharedlo;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -388,6 +388,7 @@
68FDBE3118053A140064DD74 /* ios_sharedlo-Prefix.pch */, 68FDBE3118053A140064DD74 /* ios_sharedlo-Prefix.pch */,
); );
name = "Supporting Files"; name = "Supporting Files";
path = ios_sharedlo;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
889B7926180FF8DF005A3149 /* role */ = { 889B7926180FF8DF005A3149 /* role */ = {
@@ -557,7 +558,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.1; IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LD_NO_PIE = NO; LD_NO_PIE = NO;
LINK_WITH_STANDARD_LIBRARIES = NO; LINK_WITH_STANDARD_LIBRARIES = NO;
LLVM_LTO = YES; LLVM_LTO = NO;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO; STRIP_INSTALLED_PRODUCT = NO;
@@ -593,7 +594,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.1; IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LD_NO_PIE = NO; LD_NO_PIE = NO;
LINK_WITH_STANDARD_LIBRARIES = NO; LINK_WITH_STANDARD_LIBRARIES = NO;
LLVM_LTO = YES; LLVM_LTO = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO; STRIP_INSTALLED_PRODUCT = NO;
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
@@ -605,11 +606,12 @@
buildSettings = { buildSettings = {
DSTROOT = /tmp/ios_sharedlo.dst; DSTROOT = /tmp/ios_sharedlo.dst;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ios_sharedlo/ios_sharedlo-Prefix.pch"; GCC_PREFIX_HEADER = "ios_sharedlo/ios_sharedlo-Prefix.pch";
LD_NO_PIE = NO; LD_NO_PIE = NO;
LINK_WITH_STANDARD_LIBRARIES = NO; LINK_WITH_STANDARD_LIBRARIES = NO;
LLVM_LTO = NO;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@@ -622,11 +624,12 @@
buildSettings = { buildSettings = {
DSTROOT = /tmp/ios_sharedlo.dst; DSTROOT = /tmp/ios_sharedlo.dst;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ios_sharedlo/ios_sharedlo-Prefix.pch"; GCC_PREFIX_HEADER = "ios_sharedlo/ios_sharedlo-Prefix.pch";
LD_NO_PIE = NO; LD_NO_PIE = NO;
LINK_WITH_STANDARD_LIBRARIES = NO; LINK_WITH_STANDARD_LIBRARIES = NO;
LLVM_LTO = NO;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;
@@ -669,7 +672,7 @@
IPHONEOS_DEPLOYMENT_TARGET = 6.1; IPHONEOS_DEPLOYMENT_TARGET = 6.1;
LD_NO_PIE = NO; LD_NO_PIE = NO;
LINK_WITH_STANDARD_LIBRARIES = NO; LINK_WITH_STANDARD_LIBRARIES = NO;
LLVM_LTO = YES; LLVM_LTO = NO;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos; SDKROOT = iphoneos;
STRIP_INSTALLED_PRODUCT = NO; STRIP_INSTALLED_PRODUCT = NO;
@@ -681,11 +684,12 @@
buildSettings = { buildSettings = {
DSTROOT = /tmp/ios_sharedlo.dst; DSTROOT = /tmp/ios_sharedlo.dst;
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_LINK_WITH_DYNAMIC_LIBRARIES = NO; GCC_LINK_WITH_DYNAMIC_LIBRARIES = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "ios_sharedlo/ios_sharedlo-Prefix.pch"; GCC_PREFIX_HEADER = "ios_sharedlo/ios_sharedlo-Prefix.pch";
LD_NO_PIE = NO; LD_NO_PIE = NO;
LINK_WITH_STANDARD_LIBRARIES = NO; LINK_WITH_STANDARD_LIBRARIES = NO;
LLVM_LTO = NO;
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES; SKIP_INSTALL = YES;