Changeset 13427 for trunk/Transmission.xcodeproj/project.pbxproj

Timestamp:

Aug 12, 2012, 2:38:10 PM (10 years ago)

Author:

livings124

Message:

use the curl we supply when compiling the Quick Look plugin

File:

• trunk/Transmission.xcodeproj/project.pbxproj (modified) (12 diffs)

trunk/Transmission.xcodeproj/project.pbxproj

@@ -262 +262 @@
                 A2AAB65F0DE0CF6200E04DDA /* rpcimpl.c in Sources */ = {isa = PBXBuildFile; fileRef = A2AAB65B0DE0CF6200E04DDA /* rpcimpl.c */; };
                 A2AAB6650DE0D08B00E04DDA /* blocklist.h in Headers */ = {isa = PBXBuildFile; fileRef = A2D307930D9EC4860051FD27 /* blocklist.h */; };
+                A2AB76B715D7F6DF009EFC95 /* libcurl.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A2AB76B615D7F6DF009EFC95 /* libcurl.4.dylib */; };
                 A2AF1C390A3D0F6200F1575D /* FileOutlineView.m in Sources */ = {isa = PBXBuildFile; fileRef = A2AF1C370A3D0F6200F1575D /* FileOutlineView.m */; };
                 A2B3FB460E5901E700FF78FB /* cli.c in Sources */ = {isa = PBXBuildFile; fileRef = A2B3FB450E5901E700FF78FB /* cli.c */; };
@@ -385 +386 @@
                 A2F35BD415C5A19A00EBF632 /* libtransmission.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D18389709DEC0030047D688 /* libtransmission.a */; };
                 A2F35BD715C5A46D00EBF632 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A27653A714369C5C009D3CCF /* libcrypto.dylib */; };
-                A2F35BD915C5A48400EBF632 /* libcurl.4.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A2F35BD815C5A48400EBF632 /* libcurl.4.dylib */; };
                 A2F35BDA15C5A49200EBF632 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A2B6141B1395ADE9000E0975 /* libz.dylib */; };
                 A2F35BDB15C5A4A000EBF632 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A296EF3411E5605E004A2781 /* libiconv.dylib */; };
@@ -965 +965 @@
                 A2AAB65A0DE0CF6200E04DDA /* rpc-server.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "rpc-server.h"; path = "libtransmission/rpc-server.h"; sourceTree = "<group>"; };
                 A2AAB65B0DE0CF6200E04DDA /* rpcimpl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = rpcimpl.c; path = libtransmission/rpcimpl.c; sourceTree = "<group>"; };
+                A2AB76B615D7F6DF009EFC95 /* libcurl.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.4.dylib; path = "third-party/curl/lib/libcurl.4.dylib"; sourceTree = SOURCE_ROOT; };
                 A2AC81D60D987E2D00A2878C /* nl */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = nl; path = macosx/nl.lproj/AddWindow.xib; sourceTree = "<group>"; };
                 A2AF1C360A3D0F6200F1575D /* FileOutlineView.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = FileOutlineView.h; path = macosx/FileOutlineView.h; sourceTree = "<group>"; };
@@ -1113 +1114 @@
                 A2F35BCD15C5A0A100EBF632 /* main.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; name = main.c; path = macosx/QuickLookPlugin/main.c; sourceTree = SOURCE_ROOT; };
                 A2F35BCF15C5A0A100EBF632 /* QuickLookPlugin-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "QuickLookPlugin-Prefix.pch"; path = "macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch"; sourceTree = SOURCE_ROOT; };
-                A2F35BD815C5A48400EBF632 /* libcurl.4.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcurl.4.dylib; path = usr/lib/libcurl.4.dylib; sourceTree = SDKROOT; };
                 A2F35BE015C5A7ED00EBF632 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
                 A2F35BE215C5A7F900EBF632 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
@@ -1254 +1254 @@
                                 A2F35BDB15C5A4A000EBF632 /* libiconv.dylib in Frameworks */,
                                 A2F35BDA15C5A49200EBF632 /* libz.dylib in Frameworks */,
-                                A2F35BD915C5A48400EBF632 /* libcurl.4.dylib in Frameworks */,
                                 A2F35BD715C5A46D00EBF632 /* libcrypto.dylib in Frameworks */,
+                                A2AB76B715D7F6DF009EFC95 /* libcurl.4.dylib in Frameworks */,
                         );
                         runOnlyForDeploymentPostprocessing = 0;
@@ -1790 +1790 @@
                         isa = PBXGroup;
                         children = (
+                                A2AB76B615D7F6DF009EFC95 /* libcurl.4.dylib */,
                                 A2F35BE215C5A7F900EBF632 /* Foundation.framework */,
                                 A2F35BE015C5A7ED00EBF632 /* Cocoa.framework */,
-                                A2F35BD815C5A48400EBF632 /* libcurl.4.dylib */,
                         );
                         name = Frameworks;
@@ -3249 +3249 @@
                         buildSettings = {
                                 ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                 COPY_PHASE_STRIP = NO;
                                 DEAD_CODE_STRIPPING = NO;
@@ -3367 +3368 @@
                         buildSettings = {
                                 ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                 DEAD_CODE_STRIPPING = YES;
                                 DEBUG_INFORMATION_FORMAT = stabs;
@@ -3424 +3426 @@
                         buildSettings = {
                                 ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
+                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                 COPY_PHASE_STRIP = NO;
                                 DEAD_CODE_STRIPPING = NO;
@@ -3587 +3590 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ALWAYS_SEARCH_USER_PATHS = NO;
-                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                 GCC_PREFIX_HEADER = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch";
                                 INFOPLIST_FILE = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
                                 INSTALL_PATH = /Library/QuickLook;
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "\"$(SRCROOT)/third-party/curl/lib\"",
+                                );
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                                 WRAPPER_EXTENSION = qlgenerator;
@@ -3600 +3605 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ALWAYS_SEARCH_USER_PATHS = NO;
-                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                 GCC_PREFIX_HEADER = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch";
                                 INFOPLIST_FILE = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
                                 INSTALL_PATH = /Library/QuickLook;
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "\"$(SRCROOT)/third-party/curl/lib\"",
+                                );
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                                 WRAPPER_EXTENSION = qlgenerator;
@@ -3613 +3620 @@
                         isa = XCBuildConfiguration;
                         buildSettings = {
-                                ALWAYS_SEARCH_USER_PATHS = NO;
-                                CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
                                 GCC_PREFIX_HEADER = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Prefix.pch";
                                 INFOPLIST_FILE = "$(SRCROOT)/macosx/QuickLookPlugin/QuickLookPlugin-Info.plist";
                                 INSTALL_PATH = /Library/QuickLook;
+                                LIBRARY_SEARCH_PATHS = (
+                                        "$(inherited)",
+                                        "\"$(SRCROOT)/third-party/curl/lib\"",
+                                );
                                 PRODUCT_NAME = "$(TARGET_NAME)";
                                 WRAPPER_EXTENSION = qlgenerator;