From 6471cf8e431867dec8017cb5ce8b8e463ca6bcd5 Mon Sep 17 00:00:00 2001 From: Stefan Becker Date: Mon, 16 Oct 2017 20:21:32 +0300 Subject: [PATCH] adium: clean up paths in xcconfigs Framework search path and header search paths pointing into generated Adium framworks directories is only needed for the Adium plugin code, not for SIPE core or purple backend code. --- src/adium/xcconfigs/Base.xcconfig | 3 +-- src/adium/xcconfigs/SIPEAdiumPlugin.xcconfig | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/adium/xcconfigs/Base.xcconfig b/src/adium/xcconfigs/Base.xcconfig index 1670f4b2..07bb4fcf 100644 --- a/src/adium/xcconfigs/Base.xcconfig +++ b/src/adium/xcconfigs/Base.xcconfig @@ -11,8 +11,7 @@ INFOPLIST_PREPROCESS = YES MACOSX_DEPLOYMENT_TARGET = 10.8 -FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)"/** "../../../adium/Frameworks" -HEADER_SEARCH_PATHS = "../../../adium/Frameworks/libglib.framework/Headers" "../../../adium/Frameworks/libpurple.framework/Headers" "../../../adium/Frameworks/libintl.framework/Headers" "$(BUILT_PRODUCTS_DIR)/Adium.framework/Headers" "$(BUILT_PRODUCTS_DIR)/AIUtilities.framework/Headers" "$(BUILT_PRODUCTS_DIR)/AdiumLibpurple.framework/Headers" ../purple ../api /usr/include/libxml2 . ../../../openssl-0.9.8za/include +HEADER_SEARCH_PATHS = "../../../adium/Frameworks/libglib.framework/Headers" "../../../adium/Frameworks/libpurple.framework/Headers" "../../../adium/Frameworks/libintl.framework/Headers" ../purple ../api /usr/include/libxml2 . ../../../openssl-0.9.8za/include // Hack to work around how xcconfig pre-processor handles double-slash as a comment (even in a quoted string!!) :( SLASH=/ diff --git a/src/adium/xcconfigs/SIPEAdiumPlugin.xcconfig b/src/adium/xcconfigs/SIPEAdiumPlugin.xcconfig index a23aa10e..b1cfe35c 100644 --- a/src/adium/xcconfigs/SIPEAdiumPlugin.xcconfig +++ b/src/adium/xcconfigs/SIPEAdiumPlugin.xcconfig @@ -15,9 +15,5 @@ DEPLOYMENT_LOCATION = YES DEPLOYMENT_POSTPROCESSING = YES DSTROOT = INSTALL_PATH = $(HOME)/Library/Application Support/Adium 2.0/PlugIns/ -USER_HEADER_SEARCH_PATHS = ../../../adium/Source - - - - - +FRAMEWORK_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)" ../../../adium/Frameworks +USER_HEADER_SEARCH_PATHS = "$(BUILT_PRODUCTS_DIR)/Adium.framework/Headers" ../../../adium/Source -- 2.11.4.GIT