From 918475a2b198d8b24829086b6a200381f083b6d9 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Mon, 30 Nov 2015 02:53:28 -0800 Subject: [PATCH] Mac: Update Xcode project for compatibility with Travis-CI: expect third party packages (or symbolic links to them) to be in ../mac3rdParty directory. --- mac_build/boinc.xcodeproj/project.pbxproj | 68 +++++++++++------------ 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index 7f4df191b0..490e1c9016 100755 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -3553,16 +3553,16 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; HEADER_SEARCH_PATHS = ( - "../../wxWidgets-3.0.0/include", - "../../wxWidgets-3.0.0/build/osx/setup/cocoa/include", + "../mac3rdParty/wxWidgets-3.0.0/include", + "../mac3rdParty/wxWidgets-3.0.0/build/osx/setup/cocoa/include", ../clientgui, ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( - "../../wxWidgets-3.0.0/build/osx/build/Debug", - "\"$(SRCROOT)/../../wxWidgets-3.0.0/build/osx/build/Debug\"", - "../../sqlite-autoconf-3080300/.libs/", - "\"$(SRCROOT)/../../sqlite-autoconf-3080300/.libs\"", + "../mac3rdParty/wxWidgets-3.0.0/build/osx/build/Debug", + "\"$(SRCROOT)/../mac3rdParty/wxWidgets-3.0.0/build/osx/build/Debug\"", + "../mac3rdParty/sqlite-autoconf-3080300/.libs/", + "\"$(SRCROOT)/../mac3rdParty/sqlite-autoconf-3080300/.libs\"", ); OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", @@ -3580,7 +3580,7 @@ "-bind_at_load", "-D_THREAD_SAFE", "-lwx_osx_cocoa_static", - "../../sqlite-autoconf-3080300/.libs/libsqlite3.a", + "../mac3rdParty/sqlite-autoconf-3080300/.libs/libsqlite3.a", "-lz", "-lpthread", "-lm", @@ -3609,16 +3609,16 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ../clientgui/mac/MacGUI.pch; HEADER_SEARCH_PATHS = ( - "../../wxWidgets-3.0.0/include", - "../../wxWidgets-3.0.0/build/osx/setup/cocoa/include", + "../mac3rdParty/wxWidgets-3.0.0/include", + "../mac3rdParty/wxWidgets-3.0.0/build/osx/setup/cocoa/include", ../clientgui, ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( - "../../wxWidgets-3.0.0/build/osx/build/Release", - "\"$(SRCROOT)/../../wxWidgets-3.0.0/build/osx/build/Release\"", - "../../sqlite-autoconf-3080300/.libs/", - "\"$(SRCROOT)/../../sqlite-autoconf-3080300/.libs\"", + "../mac3rdParty/wxWidgets-3.0.0/build/osx/build/Release", + "\"$(SRCROOT)/../mac3rdParty/wxWidgets-3.0.0/build/osx/build/Release\"", + "../mac3rdParty/sqlite-autoconf-3080300/.libs/", + "\"$(SRCROOT)/../mac3rdParty/sqlite-autoconf-3080300/.libs\"", ); OTHER_CFLAGS = ( "-DHAVE_CONFIG_H", @@ -3638,7 +3638,7 @@ "-bind_at_load", "-D_THREAD_SAFE", "-lwx_osx_cocoa_static", - "../../sqlite-autoconf-3080300/.libs/libsqlite3.a", + "../mac3rdParty/sqlite-autoconf-3080300/.libs/libsqlite3.a", "-lz", "-lpthread", "-lm", @@ -3744,8 +3744,8 @@ HEADER_SEARCH_PATHS = ( ../api/, ../samples/jpeglib/, - "../../freetype-2.4.10/include", - "../../ftgl-2.1.3~rc5/src", + "../mac3rdParty/freetype-2.4.10/include", + "../mac3rdParty/ftgl-2.1.3~rc5/src", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -3754,8 +3754,8 @@ OTHER_LDFLAGS = ( "-lresolv", "-ljpeg", - "../../freetype-2.4.10/objs/.libs/libfreetype.a", - "../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "../mac3rdParty/freetype-2.4.10/objs/.libs/libfreetype.a", + "../mac3rdParty/ftgl-2.1.3~rc5/src/.libs/libftgl.a", "-lz", "-lbz2", ); @@ -3769,8 +3769,8 @@ HEADER_SEARCH_PATHS = ( ../api/, ../samples/jpeglib/, - "../../freetype-2.4.10/include", - "../../ftgl-2.1.3~rc5/src", + "../mac3rdParty/freetype-2.4.10/include", + "../mac3rdParty/ftgl-2.1.3~rc5/src", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -3779,8 +3779,8 @@ OTHER_LDFLAGS = ( "-lresolv", "-ljpeg", - "../../freetype-2.4.10/objs/.libs/libfreetype.a", - "../../ftgl-2.1.3~rc5/src/.libs/libftgl.a", + "../mac3rdParty/freetype-2.4.10/objs/.libs/libfreetype.a", + "../mac3rdParty/ftgl-2.1.3~rc5/src/.libs/libftgl.a", "-lz", "-lbz2", ); @@ -3884,7 +3884,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; - HEADER_SEARCH_PATHS = "../../curl-7.39.0/include"; + HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.39.0/include"; INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; LIBRARY_SEARCH_PATHS = ""; "OTHER_CFLAGS[arch=x86_64]" = ( @@ -3896,16 +3896,16 @@ ); OTHER_LDFLAGS = ( "-L.", - "../../curl-7.39.0/lib/.libs/libcurl.a", - "../../c-ares-1.10.0/.libs/libcares.a", - "../../openssl-1.0.1j/libcrypto.a", - "../../openssl-1.0.1j/libssl.a", + "../mac3rdParty/curl-7.39.0/lib/.libs/libcurl.a", + "../mac3rdParty/c-ares-1.10.0/.libs/libcares.a", + "../mac3rdParty/openssl-1.0.1j/libcrypto.a", + "../mac3rdParty/openssl-1.0.1j/libssl.a", "-lldap", "-lz", ); PRODUCT_NAME = boinc; STRIP_INSTALLED_PRODUCT = NO; - USER_HEADER_SEARCH_PATHS = "../../curl-7.39.0/include"; + USER_HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.39.0/include"; }; name = Deployment; }; @@ -4056,7 +4056,7 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; DEPLOYMENT_POSTPROCESSING = YES; - HEADER_SEARCH_PATHS = "../../curl-7.39.0/include"; + HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.39.0/include"; INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; LIBRARY_SEARCH_PATHS = ""; OTHER_CFLAGS = ( @@ -4067,16 +4067,16 @@ ); OTHER_LDFLAGS = ( "-L.", - "../../curl-7.39.0/lib/.libs/libcurl.a", - "../../c-ares-1.10.0/.libs/libcares.a", - "../../openssl-1.0.1j/libcrypto.a", - "../../openssl-1.0.1j/libssl.a", + "../mac3rdParty/curl-7.39.0/lib/.libs/libcurl.a", + "../mac3rdParty/c-ares-1.10.0/.libs/libcares.a", + "../mac3rdParty/openssl-1.0.1j/libcrypto.a", + "../mac3rdParty/openssl-1.0.1j/libssl.a", "-lldap", "-lz", ); PRODUCT_NAME = boinc; STRIP_INSTALLED_PRODUCT = NO; - USER_HEADER_SEARCH_PATHS = "../../curl-7.39.0/include"; + USER_HEADER_SEARCH_PATHS = "../mac3rdParty/curl-7.39.0/include"; }; name = Development; };