[Lldb-commits] [lldb] r105864 - /lldb/trunk/lldb.xcodeproj/project.pbxproj

[Jason Molenda]

Author: jmolenda
Date: Fri Jun 11 19:38:35 2010
New Revision: 105864

URL: http://llvm.org/viewvc/llvm-project?rev=105864&view=rev
Log:
Update USER_HEADER_SEARCH_PATHS settings to all be the same.
Change the Release -rpath LDFLAG to look for LLDB.framework in the
same directory as the lldb binary itself.  For the BuildAndIntegration
target, continue to use the ../../ etc path to match how we install
the binaries inside Apple.

Patch from Dimiter "malkia" Stanev.  I still need to look at the
suggested changing of ONLY_ACTIVE_ARCH settings.

Modified:
    lldb/trunk/lldb.xcodeproj/project.pbxproj

Modified: lldb/trunk/lldb.xcodeproj/project.pbxproj
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/lldb.xcodeproj/project.pbxproj?rev=105864&r1=105863&r2=105864&view=diff
==============================================================================
--- lldb/trunk/lldb.xcodeproj/project.pbxproj (original)
+++ lldb/trunk/lldb.xcodeproj/project.pbxproj Fri Jun 11 19:38:35 2010
@@ -2851,7 +2851,7 @@
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = lldb;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include/lldb/Utility";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source/Host/macosx/cfcpp $(SRCROOT)/llvm/include $(SRCROOT)/llvm/tools/clang/include $(LLVM_BUILD_DIR)/llvm/include $(LLVM_BUILD_DIR)/llvm/tools/clang/include";
 				VERSIONING_SYSTEM = "apple-generic";
 				ZERO_LINK = NO;
 			};
@@ -2972,11 +2972,11 @@
 					__TEXT,
 					__info_plist,
 					"$(PROJECT_DIR)/tools/driver/lldb-Info.plist",
-					"-Wl,-rpath, at loader_path/../../Library/PrivateFrameworks/",
+					"-Wl,-rpath, at loader_path/",
 				);
 				PREBINDING = NO;
 				PRODUCT_NAME = lldb;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include/lldb/Utility";
+				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/include $(SRCROOT)/source/Host/macosx/cfcpp $(SRCROOT)/llvm/include $(SRCROOT)/llvm/tools/clang/include $(LLVM_BUILD_DIR)/llvm/include $(LLVM_BUILD_DIR)/llvm/tools/clang/include";
 				VERSIONING_SYSTEM = "apple-generic";
 				ZERO_LINK = NO;
 			};