Update the XCode project files.

Adjusted the include paths and the dependencies.
Added the external configuration options.

Change-Id: I003ba340fd1615b0bbf804daf39605350c10f07b

3 files changed, 63 insertions, 18 deletions

diff --git a/MacConfigExternalDebug.xcconfig b/MacConfigExternalDebug.xcconfig
new file mode 100644
index 0000000..3fb74c5
--- /dev/null
+++ b/MacConfigExternalDebug.xcconfig
@@ -0,0 +1,19 @@
+SDKROOT=macosx10.5
+ARCHS=i386
+GCC_ALTIVEC_EXTENSIONS=YES
+GCC_ENABLE_CPP_EXCEPTIONS=YES
+GCC_ENABLE_FIX_AND_CONTINUE=NO
+GCC_ENABLE_SSE3_EXTENSIONS=YES
+GCC_INLINES_ARE_PRIVATE_EXTERN=YES
+GCC_OPTIMIZATION_LEVEL=0
+GCC_PREPROCESSOR_DEFINITIONS=DEBUG _DEBUG _PORT_DEBUG _BACKWARD_BACKWARD_WARNING_H _AFT_BUILD
+GCC_SYMBOLS_PRIVATE_EXTERN=YES
+GCC_VERSION=4.2
+INSTALL_PATH=@executable_path
+MACOSX_DEPLOYMENT_TARGET=10.5
+MAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5
+MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5
+OTHER_CFLAGS=-fexceptions
+SDKROOT=macosx10.5
+WARNING_CFLAGS=-Wno-deprecated-declarations
+ZERO_LINK=NO
diff --git a/MacConfigExternalRelease.xcconfig b/MacConfigExternalRelease.xcconfig
new file mode 100644
index 0000000..6a58f19
--- /dev/null
+++ b/MacConfigExternalRelease.xcconfig
@@ -0,0 +1,27 @@
+SDKROOT=macosx10.5
+ARCHS=ppc i386
+COPY_PHASE_STRIP=NO
+DEAD_CODE_STRIPPING=YES
+DEBUG_INFORMATION_FORMAT=dwarf-with-dsym
+DEPLOYMENT_POSTPROCESSING=YES
+GCC_ALTIVEC_EXTENSIONS=YES
+GCC_ENABLE_CPP_EXCEPTIONS=YES
+GCC_ENABLE_FIX_AND_CONTINUE=NO
+GCC_ENABLE_SSE3_EXTENSIONS=YES
+GCC_GENERATE_DEBUGGING_SYMBOLS=YES
+GCC_INLINES_ARE_PRIVATE_EXTERN=YES
+GCC_PREPROCESSOR_DEFINITIONS=NDEBUG _NDEBUG _PORT_NDEBUG _BACKWARD_BACKWARD_WARNING_H _AFT_BUILD
+GCC_SYMBOLS_PRIVATE_EXTERN=YES
+GCC_UNROLL_LOOPS=YES
+GCC_VERSION=4.2
+INSTALL_PATH=@executable_path
+MACOSX_DEPLOYMENT_TARGET=10.5
+MAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5
+MAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5
+OTHER_CFLAGS=-fexceptions
+PRESERVE_DEAD_CODE_INITS_AND_TERMS=YES
+SDKROOT=macosx10.5
+SEPARATE_STRIP=YES
+STRIP_INSTALLED_PRODUCT=YES
+WARNING_CFLAGS=-Wno-deprecated-declarations
+ZERO_LINK=NO
diff --git a/libusb-compat.xcodeproj/project.pbxproj b/libusb-compat.xcodeproj/project.pbxproj
index a598d6e..5bb4897 100644
--- a/libusb-compat.xcodeproj/project.pbxproj
+++ b/libusb-compat.xcodeproj/project.pbxproj
@@ -7,22 +7,22 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5A726C7E138D82D500E748DE /* libusb.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 5A726C22138D81BA00E748DE /* libusb.dylib */; };
 		B0B3C5B61277AD310086FE9A /* core.c in Sources */ = {isa = PBXBuildFile; fileRef = B0B3C5B31277AD310086FE9A /* core.c */; };
 		B0B3C5B71277AD310086FE9A /* usb.h in Headers */ = {isa = PBXBuildFile; fileRef = B0B3C5B41277AD310086FE9A /* usb.h */; };
 		B0B3C5B81277AD310086FE9A /* usbi.h in Headers */ = {isa = PBXBuildFile; fileRef = B0B3C5B51277AD310086FE9A /* usbi.h */; };
-		B0B3C6B61277AE500086FE9A /* libusb.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = B0B3C6B51277AE4B0086FE9A /* libusb.dylib */; };
 		D7D0FF8B1124E29800E01FE7 /* config.h in Headers */ = {isa = PBXBuildFile; fileRef = D7D0FF621124E29800E01FE7 /* config.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
-		B0B3C6B41277AE4B0086FE9A /* PBXContainerItemProxy */ = {
+		5A726C21138D81BA00E748DE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B0B3C6AD1277AE4B0086FE9A /* libusb.xcodeproj */;
 			proxyType = 2;
 			remoteGlobalIDString = D2AAC0630554660B00DB518D;
 			remoteInfo = libusb;
 		};
-		B0B3C6B71277AE5E0086FE9A /* PBXContainerItemProxy */ = {
+		5A726E87138DA17400E748DE /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = B0B3C6AD1277AE4B0086FE9A /* libusb.xcodeproj */;
 			proxyType = 1;
@@ -35,10 +35,10 @@
 		B0B3C5B31277AD310086FE9A /* core.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = core.c; path = libusb/core.c; sourceTree = SOURCE_ROOT; };
 		B0B3C5B41277AD310086FE9A /* usb.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = usb.h; path = libusb/usb.h; sourceTree = SOURCE_ROOT; };
 		B0B3C5B51277AD310086FE9A /* usbi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = usbi.h; path = libusb/usbi.h; sourceTree = SOURCE_ROOT; };
-		B0B3C6AD1277AE4B0086FE9A /* libusb.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libusb.xcodeproj; path = "../libusb-1.0.8/libusb.xcodeproj"; sourceTree = SOURCE_ROOT; };
+		B0B3C6AD1277AE4B0086FE9A /* libusb.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = libusb.xcodeproj; path = ../libusb/libusb.xcodeproj; sourceTree = SOURCE_ROOT; };
 		D2AAC0630554660B00DB518D /* libusb-compat.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libusb-compat.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
-		D71350461124D56600E2C1DA /* MacConfigExternalDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = MacConfigExternalDebug.xcconfig; path = ../MacConfigExternalDebug.xcconfig; sourceTree = SOURCE_ROOT; };
-		D71350471124D56600E2C1DA /* MacConfigExternalRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = MacConfigExternalRelease.xcconfig; path = ../MacConfigExternalRelease.xcconfig; sourceTree = SOURCE_ROOT; };
+		D71350461124D56600E2C1DA /* MacConfigExternalDebug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = MacConfigExternalDebug.xcconfig; sourceTree = "<group>"; };
+		D71350471124D56600E2C1DA /* MacConfigExternalRelease.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = MacConfigExternalRelease.xcconfig; sourceTree = "<group>"; };
 		D7D0FF621124E29800E01FE7 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
@@ -47,7 +47,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B0B3C6B61277AE500086FE9A /* libusb.dylib in Frameworks */,
+				5A726C7E138D82D500E748DE /* libusb.dylib in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -85,10 +85,10 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		B0B3C6AE1277AE4B0086FE9A /* Products */ = {
+		5A726C1E138D81BA00E748DE /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				B0B3C6B51277AE4B0086FE9A /* libusb.dylib */,
+				5A726C22138D81BA00E748DE /* libusb.dylib */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -121,7 +121,7 @@
 			buildRules = (
 			);
 			dependencies = (
-				B0B3C6B81277AE5E0086FE9A /* PBXTargetDependency */,
+				5A726E88138DA17400E748DE /* PBXTargetDependency */,
 			);
 			name = "libusb-compat";
 			productName = "libusb-compat";
@@ -135,7 +135,6 @@
 			isa = PBXProject;
 			buildConfigurationList = 1DEB914E08733D8E0010E9CD /* Build configuration list for PBXProject "libusb-compat" */;
 			compatibilityVersion = "Xcode 3.1";
-			developmentRegion = English;
 			hasScannedForEncodings = 1;
 			knownRegions = (
 				English,
@@ -147,7 +146,7 @@
 			projectDirPath = "";
 			projectReferences = (
 				{
-					ProductGroup = B0B3C6AE1277AE4B0086FE9A /* Products */;
+					ProductGroup = 5A726C1E138D81BA00E748DE /* Products */;
 					ProjectRef = B0B3C6AD1277AE4B0086FE9A /* libusb.xcodeproj */;
 				},
 			);
@@ -159,11 +158,11 @@
 /* End PBXProject section */
 
 /* Begin PBXReferenceProxy section */
-		B0B3C6B51277AE4B0086FE9A /* libusb.dylib */ = {
+		5A726C22138D81BA00E748DE /* libusb.dylib */ = {
 			isa = PBXReferenceProxy;
 			fileType = "compiled.mach-o.dylib";
 			path = libusb.dylib;
-			remoteRef = B0B3C6B41277AE4B0086FE9A /* PBXContainerItemProxy */;
+			remoteRef = 5A726C21138D81BA00E748DE /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
 /* End PBXReferenceProxy section */
@@ -197,10 +196,10 @@
 /* End PBXSourcesBuildPhase section */
 
 /* Begin PBXTargetDependency section */
-		B0B3C6B81277AE5E0086FE9A /* PBXTargetDependency */ = {
+		5A726E88138DA17400E748DE /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
 			name = libusb;
-			targetProxy = B0B3C6B71277AE5E0086FE9A /* PBXContainerItemProxy */;
+			targetProxy = 5A726E87138DA17400E748DE /* PBXContainerItemProxy */;
 		};
 /* End PBXTargetDependency section */
 
@@ -210,7 +209,7 @@
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				HEADER_SEARCH_PATHS = "../libusb-1.0.8/libusb/";
+				HEADER_SEARCH_PATHS = ../libusb/libusb/;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-Wall",
@@ -230,7 +229,7 @@
 			buildSettings = {
 				EXECUTABLE_PREFIX = lib;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
-				HEADER_SEARCH_PATHS = "../libusb-1.0.8/libusb/";
+				HEADER_SEARCH_PATHS = ../libusb/libusb/;
 				OTHER_CFLAGS = (
 					"$(inherited)",
 					"-Wall",