From 1b8c24f3373f71f831b61f5c003cf89704b874bd Mon Sep 17 00:00:00 2001 From: dmaclach Date: Thu, 29 Jul 2010 05:25:43 +0000 Subject: review: http://breakpad.appspot.com/138001 git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@635 4c0a9323-5329-0410-9bdc-e9ce6186880e --- .../crash_report.xcodeproj/project.pbxproj | 14 +- .../dump_syms/dump_syms.xcodeproj/project.pbxproj | 194 ++++++++++++++++++++- .../symupload/symupload.xcodeproj/project.pbxproj | 10 +- 3 files changed, 199 insertions(+), 19 deletions(-) (limited to 'src/tools') diff --git a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj index d3d756b1..abf9565a 100644 --- a/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj +++ b/src/tools/mac/crash_report/crash_report.xcodeproj/project.pbxproj @@ -18,6 +18,7 @@ 8B31FF8911F0C6FB00FCF3E4 /* module.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FF8611F0C6FB00FCF3E4 /* module.cc */; }; 8B31FFC511F0C8AB00FCF3E4 /* dwarf2diehandler.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B31FFC311F0C8AB00FCF3E4 /* dwarf2diehandler.cc */; }; 8B40BDC00C0638E4009535AF /* logging.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8B40BDBF0C0638E4009535AF /* logging.cc */; }; + 8B4BDBBD120131CA009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDBBC120131CA009C7060 /* libcrypto.dylib */; }; 8DD76F9A0486AA7600D96B5E /* crash_report.mm in Sources */ = {isa = PBXBuildFile; fileRef = 08FB7796FE84155DC02AAC07 /* crash_report.mm */; settings = {ATTRIBUTES = (); }; }; 8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 08FB779EFE84155DC02AAC07 /* Foundation.framework */; }; 9B35FEEA0B26761C008DE8C7 /* basic_code_modules.cc in Sources */ = {isa = PBXBuildFile; fileRef = 9B35FEE70B26761C008DE8C7 /* basic_code_modules.cc */; }; @@ -47,7 +48,7 @@ /* Begin PBXFileReference section */ 08FB7796FE84155DC02AAC07 /* crash_report.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = crash_report.mm; sourceTree = ""; }; - 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 5578003E0BE1F28500EC23E0 /* macho_utilities.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = macho_utilities.cc; path = ../../../common/mac/macho_utilities.cc; sourceTree = SOURCE_ROOT; }; 5578003F0BE1F28500EC23E0 /* macho_utilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = macho_utilities.h; path = ../../../common/mac/macho_utilities.h; sourceTree = SOURCE_ROOT; }; 8B31025311F0D2D400FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; }; @@ -72,6 +73,7 @@ 8B31FFC311F0C8AB00FCF3E4 /* dwarf2diehandler.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = dwarf2diehandler.cc; path = ../../../common/dwarf/dwarf2diehandler.cc; sourceTree = SOURCE_ROOT; }; 8B31FFC411F0C8AB00FCF3E4 /* dwarf2diehandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dwarf2diehandler.h; path = ../../../common/dwarf/dwarf2diehandler.h; sourceTree = SOURCE_ROOT; }; 8B40BDBF0C0638E4009535AF /* logging.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = logging.cc; path = ../../../processor/logging.cc; sourceTree = SOURCE_ROOT; }; + 8B4BDBBC120131CA009C7060 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; 8DD76FA10486AA7600D96B5E /* crash_report */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = crash_report; sourceTree = BUILT_PRODUCTS_DIR; }; 9B35FEE20B2675F9008DE8C7 /* code_module.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_module.h; path = ../../../google_breakpad/processor/code_module.h; sourceTree = SOURCE_ROOT; }; 9B35FEE30B2675F9008DE8C7 /* code_modules.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = code_modules.h; path = ../../../google_breakpad/processor/code_modules.h; sourceTree = SOURCE_ROOT; }; @@ -134,6 +136,7 @@ buildActionMask = 2147483647; files = ( 8DD76F9C0486AA7600D96B5E /* Foundation.framework in Frameworks */, + 8B4BDBBD120131CA009C7060 /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -190,6 +193,7 @@ 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( + 8B4BDBBC120131CA009C7060 /* libcrypto.dylib */, 08FB779EFE84155DC02AAC07 /* Foundation.framework */, ); name = "External Frameworks and Libraries"; @@ -386,20 +390,16 @@ 1DEB927508733DD40010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - OTHER_LDFLAGS = "-lcrypto"; + HEADER_SEARCH_PATHS = ../../../../src; PRODUCT_NAME = crash_report; - USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)"; }; name = Debug; }; 1DEB927608733DD40010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_ENABLE_OBJC_EXCEPTIONS = YES; - OTHER_LDFLAGS = "-lcrypto"; + HEADER_SEARCH_PATHS = ../../../../src; PRODUCT_NAME = crash_report; - USER_HEADER_SEARCH_PATHS = "../../../../** $(inherited)"; }; name = Release; }; diff --git a/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj b/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj index 267745b7..2ddaf2c7 100644 --- a/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj +++ b/src/tools/mac/dump_syms/dump_syms.xcodeproj/project.pbxproj @@ -33,6 +33,7 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ + 8B4BDBCA12013288009C7060 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 8B4BDBC912013288009C7060 /* libcrypto.dylib */; }; B84A91F8116CF78F006C210E /* libgtestmockall.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B88FB024116BDFFF00407530 /* libgtestmockall.a */; }; B84A91FB116CF7AF006C210E /* module.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FAE241166603300407530 /* module.cc */; }; B84A91FC116CF7AF006C210E /* stabs_to_module.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FAE3C11666C8900407530 /* stabs_to_module.cc */; }; @@ -84,7 +85,6 @@ B88FB13F116CF38300407530 /* bytereader_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FB0DA116CEC5800407530 /* bytereader_unittest.cc */; }; B88FB14F116CF4AE00407530 /* libgtestmockall.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B88FB024116BDFFF00407530 /* libgtestmockall.a */; }; B88FB152116CF4D300407530 /* byte_cursor_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B88FB0D4116CEC0600407530 /* byte_cursor_unittest.cc */; }; - B89E0E601166556C00DD08C9 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B89E0E5F1166556C00DD08C9 /* libcrypto.dylib */; }; B89E0E781166576C00DD08C9 /* macho_reader.cc in Sources */ = {isa = PBXBuildFile; fileRef = B89E0E6E1166571D00DD08C9 /* macho_reader.cc */; }; B89E0E7A1166576C00DD08C9 /* macho_dump.cc in Sources */ = {isa = PBXBuildFile; fileRef = B89E0E701166573700DD08C9 /* macho_dump.cc */; }; B89E0E9911665A7200DD08C9 /* macho_reader_unittest.cc in Sources */ = {isa = PBXBuildFile; fileRef = B89E0E6D1166571D00DD08C9 /* macho_reader_unittest.cc */; }; @@ -269,12 +269,13 @@ /* Begin PBXFileReference section */ 08FB7796FE84155DC02AAC07 /* dump_syms.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = dump_syms.mm; path = ../../../common/mac/dump_syms.mm; sourceTree = ""; }; - 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 557800890BE1F3AB00EC23E0 /* macho_utilities.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = macho_utilities.cc; path = ../../../common/mac/macho_utilities.cc; sourceTree = SOURCE_ROOT; }; 5578008A0BE1F3AB00EC23E0 /* macho_utilities.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = macho_utilities.h; path = ../../../common/mac/macho_utilities.h; sourceTree = SOURCE_ROOT; }; 8B31023E11F0CF1C00FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; }; 8B3102D411F0D60300FCF3E4 /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; }; 8B3102D511F0D60300FCF3E4 /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; }; + 8B4BDBC912013288009C7060 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = usr/lib/libcrypto.dylib; sourceTree = SDKROOT; }; 9BDF186D0B1BB43700F8391B /* dump_syms.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = dump_syms.h; path = ../../../common/mac/dump_syms.h; sourceTree = ""; }; 9BDF186E0B1BB43700F8391B /* dump_syms_tool.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = dump_syms_tool.mm; sourceTree = ""; }; 9BE650410B52F6D800611104 /* file_id.cc */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = file_id.cc; path = ../../../common/mac/file_id.cc; sourceTree = SOURCE_ROOT; }; @@ -326,7 +327,6 @@ B88FB11F116CF27F00407530 /* dwarf_cfi_to_module_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = dwarf_cfi_to_module_unittest; sourceTree = BUILT_PRODUCTS_DIR; }; B88FB135116CF30F00407530 /* bytereader_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = bytereader_unittest; sourceTree = BUILT_PRODUCTS_DIR; }; B88FB14B116CF4A700407530 /* byte_cursor_unittest */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = byte_cursor_unittest; sourceTree = BUILT_PRODUCTS_DIR; }; - B89E0E5F1166556C00DD08C9 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = /usr/lib/libcrypto.dylib; sourceTree = ""; }; B89E0E6D1166571D00DD08C9 /* macho_reader_unittest.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = macho_reader_unittest.cc; path = ../../../common/mac/macho_reader_unittest.cc; sourceTree = SOURCE_ROOT; }; B89E0E6E1166571D00DD08C9 /* macho_reader.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = macho_reader.cc; path = ../../../common/mac/macho_reader.cc; sourceTree = SOURCE_ROOT; }; B89E0E6F1166571D00DD08C9 /* macho_reader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = macho_reader.h; path = ../../../common/mac/macho_reader.h; sourceTree = SOURCE_ROOT; }; @@ -456,7 +456,7 @@ buildActionMask = 2147483647; files = ( B8C5B523116653BA00D34F4E /* Foundation.framework in Frameworks */, - B89E0E601166556C00DD08C9 /* libcrypto.dylib in Frameworks */, + 8B4BDBCA12013288009C7060 /* libcrypto.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -500,8 +500,8 @@ 08FB779DFE84155DC02AAC07 /* External Frameworks and Libraries */ = { isa = PBXGroup; children = ( + 8B4BDBC912013288009C7060 /* libcrypto.dylib */, 08FB779EFE84155DC02AAC07 /* Foundation.framework */, - B89E0E5F1166556C00DD08C9 /* libcrypto.dylib */, ); name = "External Frameworks and Libraries"; sourceTree = ""; @@ -1225,6 +1225,13 @@ B84A91F6116CF784006C210E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = stabs_to_module_unittest; }; name = Debug; @@ -1232,6 +1239,13 @@ B84A91F7116CF784006C210E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = stabs_to_module_unittest; }; name = Release; @@ -1239,6 +1253,13 @@ B88FAF31116A591F00407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -1251,6 +1272,13 @@ B88FAF32116A591F00407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", @@ -1278,6 +1306,13 @@ isa = XCBuildConfiguration; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = stabs_reader_unittest; }; name = Debug; @@ -1286,6 +1321,13 @@ isa = XCBuildConfiguration; buildSettings = { GCC_PREPROCESSOR_DEFINITIONS = HAVE_MACH_O_NLIST_H; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = stabs_reader_unittest; }; name = Release; @@ -1293,8 +1335,13 @@ B88FB025116BE00100407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - GCC_INLINES_ARE_PRIVATE_EXTERN = YES; - GCC_SYMBOLS_PRIVATE_EXTERN = YES; + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = gtestmockall; }; name = Debug; @@ -1302,6 +1349,13 @@ B88FB026116BE00100407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = gtestmockall; }; name = Release; @@ -1309,6 +1363,13 @@ B88FB0BB116CEAC000407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = module_unittest; }; name = Debug; @@ -1316,6 +1377,13 @@ B88FB0BC116CEAC000407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = module_unittest; }; name = Release; @@ -1323,6 +1391,13 @@ B88FB0E1116CEEA800407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf2diehandler_unittest; }; name = Debug; @@ -1330,6 +1405,13 @@ B88FB0E2116CEEA800407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf2diehandler_unittest; }; name = Release; @@ -1337,6 +1419,13 @@ B88FB0F4116CEF1900407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_line_to_module_unittest; }; name = Debug; @@ -1344,6 +1433,13 @@ B88FB0F5116CEF1900407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_line_to_module_unittest; }; name = Release; @@ -1351,6 +1447,13 @@ B88FB10C116CF07A00407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_cu_to_module_unittest; }; name = Debug; @@ -1358,6 +1461,13 @@ B88FB10D116CF07A00407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_cu_to_module_unittest; }; name = Release; @@ -1365,6 +1475,13 @@ B88FB121116CF28000407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_cfi_to_module_unittest; }; name = Debug; @@ -1372,6 +1489,13 @@ B88FB122116CF28000407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = dwarf_cfi_to_module_unittest; }; name = Release; @@ -1379,6 +1503,13 @@ B88FB137116CF30F00407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = bytereader_unittest; }; name = Debug; @@ -1386,6 +1517,13 @@ B88FB138116CF30F00407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = bytereader_unittest; }; name = Release; @@ -1393,6 +1531,13 @@ B88FB14D116CF4A800407530 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = byte_cursor_unittest; }; name = Debug; @@ -1400,6 +1545,13 @@ B88FB14E116CF4A800407530 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = byte_cursor_unittest; }; name = Release; @@ -1421,6 +1573,13 @@ B89E0E9711665A6400DD08C9 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = macho_reader_unittest; }; name = Debug; @@ -1428,6 +1587,13 @@ B89E0E9811665A6400DD08C9 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = macho_reader_unittest; }; name = Release; @@ -1451,6 +1617,13 @@ D21F97D411CBA0F200239E38 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = test_assembler_unittest; }; name = Debug; @@ -1458,6 +1631,13 @@ D21F97D511CBA0F200239E38 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ( + $inherited, + ../../../testing, + ../../../testing/include, + ../../../testing/gtest, + ../../../testing/gtest/include, + ); PRODUCT_NAME = test_assembler_unittest; }; name = Release; diff --git a/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj b/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj index 73b58ddb..a6a78dc5 100644 --- a/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj +++ b/src/tools/mac/symupload/symupload.xcodeproj/project.pbxproj @@ -31,7 +31,7 @@ /* Begin PBXFileReference section */ 08FB7796FE84155DC02AAC07 /* symupload.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = symupload.m; sourceTree = ""; }; - 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; + 08FB779EFE84155DC02AAC07 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; 8B31022B11F0CE6900FCF3E4 /* Breakpad.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Breakpad.xcconfig; path = ../../../common/mac/Breakpad.xcconfig; sourceTree = SOURCE_ROOT; }; 8B3102B611F0D5CE00FCF3E4 /* BreakpadDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadDebug.xcconfig; path = ../../../common/mac/BreakpadDebug.xcconfig; sourceTree = SOURCE_ROOT; }; 8B3102B711F0D5CE00FCF3E4 /* BreakpadRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = BreakpadRelease.xcconfig; path = ../../../common/mac/BreakpadRelease.xcconfig; sourceTree = SOURCE_ROOT; }; @@ -175,16 +175,16 @@ 1DEB927508733DD40010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ../../..; PRODUCT_NAME = symupload; - USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)"; }; name = Debug; }; 1DEB927608733DD40010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ../../..; PRODUCT_NAME = symupload; - USER_HEADER_SEARCH_PATHS = "../../../** $(inherited)"; }; name = Release; }; @@ -205,16 +205,16 @@ 9BD836030B0544BB0055103E /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ../../..; PRODUCT_NAME = minidump_upload; - USER_HEADER_SEARCH_PATHS = "../../../**"; }; name = Debug; }; 9BD836040B0544BB0055103E /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + HEADER_SEARCH_PATHS = ../../..; PRODUCT_NAME = minidump_upload; - USER_HEADER_SEARCH_PATHS = "../../../**"; }; name = Release; }; -- cgit v1.2.1