From f1a44ddb9098bf62e2be758868c96173cf350163 Mon Sep 17 00:00:00 2001 From: Charlie Fenton Date: Sun, 14 Oct 2018 03:16:14 -0700 Subject: [PATCH] Mac: Changes to Xcode project to allow building under Xcode 10 --- mac_build/boinc.xcodeproj/project.pbxproj | 84 +++++++++-------------- 1 file changed, 33 insertions(+), 51 deletions(-) diff --git a/mac_build/boinc.xcodeproj/project.pbxproj b/mac_build/boinc.xcodeproj/project.pbxproj index a64270a01c..f160e9c4c7 100644 --- a/mac_build/boinc.xcodeproj/project.pbxproj +++ b/mac_build/boinc.xcodeproj/project.pbxproj @@ -91,7 +91,6 @@ DD3741D910FC94BA001257EB /* url.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDC06AB210A3E93F00C8D9A5 /* url.cpp */; }; DD3E14DB0A774397007E0084 /* boinc in Resources */ = {isa = PBXBuildFile; fileRef = DDD74D8707CF482E0065AC9D /* boinc */; }; DD3E14DC0A774397007E0084 /* BOINCMgr.icns in Resources */ = {isa = PBXBuildFile; fileRef = DDF3028907CCCE2C00701169 /* BOINCMgr.icns */; }; - DD3E14DD0A774397007E0084 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F51BDF4903086C46012012A7 /* InfoPlist.strings */; }; DD3E14DF0A774397007E0084 /* AccountInfoPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD58C41808F3343F00C1DF66 /* AccountInfoPage.cpp */; }; DD3E14E10A774397007E0084 /* AccountManagerInfoPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD58C41C08F3343F00C1DF66 /* AccountManagerInfoPage.cpp */; }; DD3E14E20A774397007E0084 /* AccountManagerProcessingPage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD58C41E08F3343F00C1DF66 /* AccountManagerProcessingPage.cpp */; }; @@ -381,6 +380,7 @@ DDAEC9FF07FA5A5C00A7BC36 /* SetVersion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDAEC9E707FA58A000A7BC36 /* SetVersion.cpp */; }; DDB00FA120E110E000C8ABEF /* filesys.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5EAD475031AEFF8018E201A /* filesys.cpp */; }; DDB00FA220E111F100C8ABEF /* util.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5EAD479031AF001018E201A /* util.cpp */; }; + DDB0805E2163019F00520B63 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F51BDF4903086C46012012A7 /* InfoPlist.strings */; }; DDB295C9185B0DBD00B9F842 /* MacNotification.mm in Sources */ = {isa = PBXBuildFile; fileRef = DDB295C8185B0DBD00B9F842 /* MacNotification.mm */; }; DDB4A91E1411840800032E5D /* proc_control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDB4A91C1411840800032E5D /* proc_control.cpp */; }; DDB4A91F1411840800032E5D /* proc_control.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DDB4A91C1411840800032E5D /* proc_control.cpp */; }; @@ -1127,6 +1127,7 @@ DDA1F1ED126D105B005EFFEB /* current_version.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = current_version.h; path = ../client/current_version.h; sourceTree = SOURCE_ROOT; }; DDA290360CB5D80E00512BD8 /* Mac_Saver_Module.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = Mac_Saver_Module.h; path = ../clientscr/Mac_Saver_Module.h; sourceTree = SOURCE_ROOT; }; DDA45502140F85DD00D97676 /* str_replace.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = str_replace.h; sourceTree = ""; }; + DDA4EDBC2171FF860005E6B5 /* mac_spawn.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = mac_spawn.h; path = ../lib/mac/mac_spawn.h; sourceTree = ""; }; DDA6BD030BD4551F008F7921 /* dyld_gdb.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dyld_gdb.h; path = ../lib/mac/dyld_gdb.h; sourceTree = SOURCE_ROOT; }; DDA6BD040BD4551F008F7921 /* mac_backtrace.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = mac_backtrace.cpp; path = ../lib/mac/mac_backtrace.cpp; sourceTree = SOURCE_ROOT; }; DDA6BD050BD4551F008F7921 /* mac_backtrace.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = mac_backtrace.h; path = ../lib/mac/mac_backtrace.h; sourceTree = SOURCE_ROOT; }; @@ -1257,7 +1258,7 @@ F5159564029EB02001F5651B /* md5_file.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = md5_file.cpp; sourceTree = ""; }; F5159565029EB02001F5651B /* md5_file.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = md5_file.h; path = ../lib/md5_file.h; sourceTree = SOURCE_ROOT; }; F519F98E02C44A7501BDB3CA /* scheduler_op.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = scheduler_op.h; path = ../client/scheduler_op.h; sourceTree = SOURCE_ROOT; }; - F51BDF4A03086C46012012A7 /* English */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; }; + F51BDF4A03086C46012012A7 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = SOURCE_ROOT; }; F51CCF1E02EFD37D018DB99A /* pers_file_xfer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = pers_file_xfer.h; path = ../client/pers_file_xfer.h; sourceTree = SOURCE_ROOT; }; F51CCF1F02EFD37D018DB99A /* pers_file_xfer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = pers_file_xfer.cpp; sourceTree = ""; }; F51DA64D02DB97FF010E292A /* crypt.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = crypt.cpp; sourceTree = ""; }; @@ -1811,6 +1812,7 @@ children = ( DDA6BD030BD4551F008F7921 /* dyld_gdb.h */, DD2C5C3D1E66D83D00BF5511 /* mac_spawn.cpp */, + DDA4EDBC2171FF860005E6B5 /* mac_spawn.h */, DDBAA9B61DF190EB004C48FD /* mac_util.h */, DDBAA9B41DF1902B004C48FD /* mac_util.mm */, DDA6BD040BD4551F008F7921 /* mac_backtrace.cpp */, @@ -2178,7 +2180,6 @@ DD3E15300A774397007E0084 /* Frameworks */, DD3E15350A774397007E0084 /* CopyFiles */, DD73550C0D91105F0006A9D1 /* ShellScript */, - DD3E15380A774397007E0084 /* ShellScript */, DD3E15390A774397007E0084 /* ShellScript */, DDEE5E8E0D9112AF0056A99E /* ShellScript */, ); @@ -2548,8 +2549,8 @@ buildActionMask = 2147483647; files = ( DD3E14DB0A774397007E0084 /* boinc in Resources */, + DDB0805E2163019F00520B63 /* InfoPlist.strings in Resources */, DD3E14DC0A774397007E0084 /* BOINCMgr.icns in Resources */, - DD3E14DD0A774397007E0084 /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -2645,21 +2646,6 @@ shellPath = /bin/sh; shellScript = "## echo \"BuiltProductsDir = ${BUILT_PRODUCTS_DIR}\"\n# echo \"SRC ROOT = ${SRCROOT}\"\n# echo \"CONFIGURATION = ${CONFIGURATION}\"\n# echo \"PRODUCT_NAME = ${PRODUCT_NAME}\"\nmkdir -p \"${SRCROOT}/build/${CONFIGURATION}\"\nif [ \"${BUILT_PRODUCTS_DIR}/lib${PRODUCT_NAME}.a\" -nt \"${SRCROOT}/build/${CONFIGURATION}/lib${PRODUCT_NAME}.a\" ]; then\n cp -fp \"${BUILT_PRODUCTS_DIR}/lib${PRODUCT_NAME}.a\" \"${SRCROOT}/build/${CONFIGURATION}/lib${PRODUCT_NAME}.a\"\n if [ \"$CONFIGURATION\" = \"Deployment\" ]; then\n strip -S \"${SRCROOT}/build/${CONFIGURATION}/lib${PRODUCT_NAME}.a\"\n fi\nfi\n"; }; - DD3E15380A774397007E0084 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "${SRCROOT}/Info.plist", - ); - outputPaths = ( - "${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/Info.plist", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "cp -fpv \"${SRCROOT}/Info.plist\" \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/Info.plist\""; - }; DD3E15390A774397007E0084 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; @@ -2743,7 +2729,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"$CONFIGURATION\" = \"Deployment\" ]; then\n ## echo \"Starting script 1\"\n echo ${BUILT_PRODUCTS_DIR} > \"${PROJECT_DIR}/Build_Deployment_Dir\"\n mkdir -p \"${BUILT_PRODUCTS_DIR}/SymbolTables\"\n if [ \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\" -nt \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_i386\" ]; then\n ## echo \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager is newer than ${TARGET_BUILD_DIR}/SymbolTables/BOINCManager_i386\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_i386\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_ppc\"\n cp -fp \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\" \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_i386\"\n touch \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_i386\"\n strip \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\"\n fi\nelse\n echo ${BUILT_PRODUCTS_DIR} > \"${PROJECT_DIR}/Build_Development_Dir\"\nfi\n"; + shellScript = "if [ \"$CONFIGURATION\" = \"Deployment\" ]; then\n ## echo \"Starting script 1\"\n echo ${BUILT_PRODUCTS_DIR} > \"${PROJECT_DIR}/Build_Deployment_Dir\"\n mkdir -p \"${BUILT_PRODUCTS_DIR}/SymbolTables\"\n if [ \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\" -nt \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_x86_64\" ]; then\n ## echo \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager is newer than ${TARGET_BUILD_DIR}/SymbolTables/BOINCManager_x86_64\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_x86_64\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_ppc\"\n cp -fp \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\" \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_x86_64\"\n touch \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_x86_64\"\n strip \"${BUILT_PRODUCTS_DIR}/BOINCManager.app/Contents/MacOS/BOINCManager\"\n fi\nelse\n echo ${BUILT_PRODUCTS_DIR} > \"${PROJECT_DIR}/Build_Development_Dir\"\nfi\n"; }; DD7355180D9110AE0006A9D1 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -2758,7 +2744,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"$CONFIGURATION\" = \"Deployment\" ]; then\n ## echo \"Starting script 1\"\n echo ${BUILT_PRODUCTS_DIR} > \"${PROJECT_DIR}/Build_Deployment_Dir\"\n mkdir -p \"${BUILT_PRODUCTS_DIR}/SymbolTables\"\n if [ \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" -nt \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\" ]; then\n ## echo \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME} is newer than ${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_i386\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_ppc\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\n cp -fp \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\n touch \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\n strip \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\"\n fi\nelse\n echo ${BUILT_PRODUCTS_DIR} > \"${PROJECT_DIR}/Build_Development_Dir\"\n\nfi"; + shellScript = "if [ \"$CONFIGURATION\" = \"Deployment\" ]; then\n ## echo \"Starting script 1\"\n echo ${BUILT_PRODUCTS_DIR} > \"${PROJECT_DIR}/Build_Deployment_Dir\"\n mkdir -p \"${BUILT_PRODUCTS_DIR}/SymbolTables\"\n if [ \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" -nt \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\" ]; then\n ## echo \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME} is newer than ${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_i386\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_ppc\"\n rm -f \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\n cp -fp \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\" \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\n touch \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\n strip \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}\"\n fi\nelse\n echo ${BUILT_PRODUCTS_DIR} > \"${PROJECT_DIR}/Build_Development_Dir\"\n\nfi\n"; }; DD73551E0D9111150006A9D1 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -2773,7 +2759,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"$CONFIGURATION\" = \"Deployment\" ]; then\n touch \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\nfi"; + shellScript = "if [ \"$CONFIGURATION\" = \"Deployment\" ]; then\n touch \"${BUILT_PRODUCTS_DIR}/SymbolTables/${PRODUCT_NAME}_x86_64\"\nfi\n"; }; DD81C827144D90FC000BE61A /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -2857,7 +2843,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"$CONFIGURATION\" = \"Deployment\" ]; then\n\ttouch \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_i386\"\nfi"; + shellScript = "if [ \"$CONFIGURATION\" = \"Deployment\" ]; then\n touch \"${BUILT_PRODUCTS_DIR}/SymbolTables/BOINCManager_x86_64\"\nfi\n"; }; DDF9EC07144EB255005D6144 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; @@ -3652,7 +3638,6 @@ DD1AFEB60A512D8700EE5B82 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ../lib; INFOPLIST_FILE = "Installer-Info.plist"; OTHER_LDFLAGS = ( "-framework", @@ -3665,7 +3650,6 @@ DD1AFEB90A512D8700EE5B82 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ../lib; INFOPLIST_FILE = "Installer-Info.plist"; OTHER_LDFLAGS = ( "-framework", @@ -3691,6 +3675,7 @@ "../../wxWidgets-3.1.0/include", "../../wxWidgets-3.1.0/build/osx/setup/cocoa/include", ../clientgui, + "../lib/**", ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( @@ -3706,7 +3691,7 @@ "-D_THREAD_SAFE", "-D__WXMAC__", "-D_DEBUG", - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1060", + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1070", "-DwxADJUST_MINSIZE=0", ); OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -3722,6 +3707,7 @@ PRODUCT_NAME = BOINCManager; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; + USER_HEADER_SEARCH_PATHS = "../lib/**"; WARNING_CFLAGS = ( "-Wmost", "-Wno-four-char-constants", @@ -3746,6 +3732,7 @@ "../../wxWidgets-3.1.0/include", "../../wxWidgets-3.1.0/build/osx/setup/cocoa/include", ../clientgui, + "../lib/**", ); INFOPLIST_FILE = Info.plist; LIBRARY_SEARCH_PATHS = ( @@ -3763,7 +3750,7 @@ "-DSANDBOX", "-D_NDEBUG", "-DBUILDING_MANAGER", - "-DMAC_OS_X_VERSION_MAX_ALLOWED=1060", + "-DMAC_OS_X_VERSION_MAX_ALLOWED=1070", "-DwxADJUST_MINSIZE=0", ); OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -3779,6 +3766,7 @@ PRODUCT_NAME = BOINCManager; SKIP_INSTALL = YES; STRIP_INSTALLED_PRODUCT = NO; + USER_HEADER_SEARCH_PATHS = "../lib/**"; WARNING_CFLAGS = ( "-Wmost", "-Wno-four-char-constants", @@ -3952,7 +3940,6 @@ DD81C79C144D8DA9000BE61A /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; EXECUTABLE_PREFIX = lib; PRODUCT_NAME = jpeg; WARNING_CFLAGS = ( @@ -3968,7 +3955,6 @@ DD81C79D144D8DA9000BE61A /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; EXECUTABLE_PREFIX = lib; PRODUCT_NAME = jpeg; WARNING_CFLAGS = ( @@ -3989,6 +3975,7 @@ ../samples/jpeglib/, "../../freetype-2.9/include", "../../ftgl-2.1.3~rc5/src", + "../lib/**", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -4016,6 +4003,7 @@ ../samples/jpeglib/, "../../freetype-2.9/include", "../../ftgl-2.1.3~rc5/src", + "../lib/**", ); LIBRARY_SEARCH_PATHS = ( "$(inherited)", @@ -4038,8 +4026,6 @@ DD9843D909920F220090855B /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - HEADER_SEARCH_PATHS = ""; OTHER_CFLAGS = ( "-D_THREAD_SAFE", "-DNDEBUG", @@ -4069,7 +4055,6 @@ DD9843DB09920F220090855B /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; HEADER_SEARCH_PATHS = ../lib; LIBRARY_SEARCH_PATHS = ../lib; "OTHER_CFLAGS[arch=ppc]" = ( @@ -4102,7 +4087,6 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; - HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = "ScreenSaver-Info.plist"; OTHER_LDFLAGS = ( "-framework", @@ -4125,6 +4109,7 @@ HEADER_SEARCH_PATHS = ( "../../curl-7.58.0/include", "../../openssl-1.1.0g/include", + "../lib/**", ); INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; LIBRARY_SEARCH_PATHS = ( @@ -4150,14 +4135,13 @@ ); PRODUCT_NAME = boinc; STRIP_INSTALLED_PRODUCT = NO; - USER_HEADER_SEARCH_PATHS = "../../curl-7.58.0/include ../../openssl-1.1.0g/include"; + USER_HEADER_SEARCH_PATHS = "../../curl-7.58.0/include ../../openssl-1.1.0g/include ../lib/**"; }; name = Deployment; }; DD9843E109920F220090855B /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ../lib; INFOPLIST_FILE = "PostInstall-Info.plist"; OTHER_CFLAGS = ( "-D_THREAD_SAFE", @@ -4204,6 +4188,8 @@ DD9843E509920F220090855B /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LIBRARY = "libc++"; COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -4213,10 +4199,11 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; + HEADER_SEARCH_PATHS = "../lib/**"; LIBRARY_STYLE = STATIC; - MACOSX_DEPLOYMENT_TARGET = 10.6; - "MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.6; - "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; + "MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.7; + "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.7; OTHER_CFLAGS = ( "-D_THREAD_SAFE", "-DNDEBUG", @@ -4241,8 +4228,6 @@ DD9E2352091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; - HEADER_SEARCH_PATHS = ""; OTHER_LDFLAGS = ""; PRODUCT_NAME = boinc; }; @@ -4251,7 +4236,6 @@ DD9E235A091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; HEADER_SEARCH_PATHS = ../lib; LIBRARY_SEARCH_PATHS = ../lib; PRODUCT_NAME = boinc_api; @@ -4270,7 +4254,6 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; - HEADER_SEARCH_PATHS = ""; INFOPLIST_FILE = "ScreenSaver-Info.plist"; OTHER_LDFLAGS = ( "-framework", @@ -4293,6 +4276,7 @@ HEADER_SEARCH_PATHS = ( "../../curl-7.58.0/include", "../../openssl-1.1.0g/include", + "../lib/**", ); INFOPLIST_PREPROCESSOR_DEFINITIONS = ""; LIBRARY_SEARCH_PATHS = ( @@ -4317,14 +4301,13 @@ ); PRODUCT_NAME = boinc; STRIP_INSTALLED_PRODUCT = NO; - USER_HEADER_SEARCH_PATHS = "../../curl-7.58.0/include ../../openssl-1.1.0g/include"; + USER_HEADER_SEARCH_PATHS = "../../curl-7.58.0/include ../../openssl-1.1.0g/include ../lib/**"; }; name = Development; }; DD9E2372091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = ../lib; INFOPLIST_FILE = "PostInstall-Info.plist"; OTHER_CFLAGS = ( "-D_THREAD_SAFE", @@ -4373,6 +4356,8 @@ DD9E2382091CBDAE0048316E /* Development */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_CXX_LIBRARY = "libc++"; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; DEPLOYMENT_POSTPROCESSING = NO; @@ -4381,10 +4366,11 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = NO; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; + HEADER_SEARCH_PATHS = "../lib/**"; LIBRARY_STYLE = STATIC; - MACOSX_DEPLOYMENT_TARGET = 10.6; - "MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.6; - "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.6; + MACOSX_DEPLOYMENT_TARGET = 10.7; + "MACOSX_DEPLOYMENT_TARGET[arch=ppc]" = 10.7; + "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.7; OTHER_CFLAGS = ( "-D_THREAD_SAFE", "-D_DEBUG", @@ -4409,7 +4395,6 @@ DDB873FD0C850BC800E0DE1F /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; HEADER_SEARCH_PATHS = ../samples/jpeglib; PRODUCT_NAME = boinc_graphics2; }; @@ -4418,7 +4403,6 @@ DDB874010C850BC800E0DE1F /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; HEADER_SEARCH_PATHS = ../samples/jpeglib; "OTHER_CFLAGS[arch=ppc]" = ( "-D_THREAD_SAFE", @@ -4473,7 +4457,6 @@ DDF9EC04144EB14B005D6144 /* Development */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; EXECUTABLE_PREFIX = lib; PRODUCT_NAME = "$(TARGET_NAME)"; }; @@ -4482,7 +4465,6 @@ DDF9EC05144EB14B005D6144 /* Deployment */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; EXECUTABLE_PREFIX = lib; PRODUCT_NAME = "$(TARGET_NAME)"; };