From feef327e059bbd615a3f5c2f1fb38c350e03a947 Mon Sep 17 00:00:00 2001 From: Leland Lucius Date: Sun, 5 Jan 2020 22:44:59 -0600 Subject: [PATCH] Partial recommit of Xcode project Recommits most of f1ee1689c695db13ef4cfc159e9a7d6fd4a23ccd but without the SDKROOT and MACOSX_DEPLOYMENT_TARGET changes. We will want to make those changes eventually though and must do so before full testing begins for next release. --- mac/Audacity.xcodeproj/project.pbxproj | 46 ++++++++++---------------- 1 file changed, 18 insertions(+), 28 deletions(-) diff --git a/mac/Audacity.xcodeproj/project.pbxproj b/mac/Audacity.xcodeproj/project.pbxproj index 97ccf43cc..1ed9204f8 100644 --- a/mac/Audacity.xcodeproj/project.pbxproj +++ b/mac/Audacity.xcodeproj/project.pbxproj @@ -1494,6 +1494,8 @@ compilerSpec = com.apple.compilers.proxy.script; filePatterns = "*.po"; fileType = pattern.proxy; + inputFiles = ( + ); isEditable = 1; outputFiles = ( "$(DERIVED_FILES_DIR)/$(INPUT_FILE_BASE).mo", @@ -9513,6 +9515,8 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; + CODE_SIGNING_ALLOWED = no; + CODE_SIGNING_REQUIRED = no; CODE_SIGN_ENTITLEMENTS = Audacity.entitlements; CODE_SIGN_STYLE = Manual; CONFIG_DEBUG = yes; @@ -9545,7 +9549,7 @@ WX_CONFIG = "$(WX_PREFIX)/bin/wx-config"; WX_CXXFLAGS = "$(WX_CFLAGS)"; WX_FLAVOR = debug; - WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_webview-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; + WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; WX_PREFIX = "/usr/local/$(ARCHS)"; WX_VER = 3.1; ZERO_LINK = NO; @@ -9558,7 +9562,6 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - ENABLE_HARDENED_RUNTIME = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "BUILDING_AUDACITY=1", @@ -9569,11 +9572,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Debug\""; + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/build/Debug\""; OTHER_CFLAGS = ( "$(WX_CFLAGS)", "$(FFMPEG_CFLAGS)", @@ -9849,6 +9848,8 @@ ARCHS = "$(ARCHS_STANDARD_32_BIT)"; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; + CODE_SIGNING_ALLOWED = no; + CODE_SIGNING_REQUIRED = no; CODE_SIGN_ENTITLEMENTS = Audacity.entitlements; CODE_SIGN_STYLE = Manual; CONFIG_DEBUG = no; @@ -9881,7 +9882,7 @@ WX_CONFIG = "$(WX_PREFIX)/bin/wx-config"; WX_CXXFLAGS = "$(WX_CFLAGS)"; WX_FLAVOR = release; - WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_webview-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; + WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; WX_PREFIX = "/usr/local/$(ARCHS)"; WX_VER = 3.1; ZERO_LINK = NO; @@ -9894,7 +9895,6 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - ENABLE_HARDENED_RUNTIME = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(TOPLEVEL)/src/AudacityHeaders.h"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -9907,11 +9907,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Release\""; + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/build/Release\""; OTHER_CFLAGS = ( "$(WX_CFLAGS)", "$(FFMPEG_CFLAGS)", @@ -10246,6 +10242,8 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_LINK_OBJC_RUNTIME = NO; + CODE_SIGNING_ALLOWED = no; + CODE_SIGNING_REQUIRED = no; CODE_SIGN_ENTITLEMENTS = Audacity.entitlements; CODE_SIGN_STYLE = Manual; CONFIG_DEBUG = yes; @@ -10278,7 +10276,7 @@ WX_CONFIG = "$(WX_PREFIX)/bin/wx-config"; WX_CXXFLAGS = "$(WX_CFLAGS)"; WX_FLAVOR = debug; - WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_webview-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; + WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; WX_PREFIX = "/usr/local/$(ARCHS)"; WX_VER = 3.1; ZERO_LINK = NO; @@ -10291,7 +10289,6 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - ENABLE_HARDENED_RUNTIME = YES; GCC_PREPROCESSOR_DEFINITIONS = ( "$(GCC_PREPROCESSOR_DEFINITIONS_QUOTED_FOR_TARGET_1)", "BUILDING_AUDACITY=1", @@ -10302,11 +10299,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Debug\""; + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/build/Debug64\""; OTHER_CFLAGS = ( "$(WX_CFLAGS)", "$(FFMPEG_CFLAGS)", @@ -10706,6 +10699,8 @@ CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_LINK_OBJC_RUNTIME = NO; + CODE_SIGNING_ALLOWED = no; + CODE_SIGNING_REQUIRED = no; CODE_SIGN_ENTITLEMENTS = Audacity.entitlements; CODE_SIGN_STYLE = Manual; CONFIG_DEBUG = no; @@ -10738,7 +10733,7 @@ WX_CONFIG = "$(WX_PREFIX)/bin/wx-config"; WX_CXXFLAGS = "$(WX_CFLAGS)"; WX_FLAVOR = release; - WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_webview-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; + WX_LDFLAGS = "-L$(WX_PREFIX)/lib -lwx_osx_cocoau_$(WX_FLAVOR)_xrc-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_html-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_qa-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_adv-$(WX_VER) -lwx_osx_cocoau_$(WX_FLAVOR)_core-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_xml-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)_net-$(WX_VER) -lwx_baseu_$(WX_FLAVOR)-$(WX_VER)"; WX_PREFIX = "/usr/local/$(ARCHS)"; WX_VER = 3.1; ZERO_LINK = NO; @@ -10751,7 +10746,6 @@ buildSettings = { COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; - ENABLE_HARDENED_RUNTIME = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "$(TOPLEVEL)/src/AudacityHeaders.h"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -10764,11 +10758,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; INFOPLIST_FILE = Info.plist; INSTALL_PATH = /; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1)", - ); - LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_1 = "\"$(SRCROOT)/build/Release\""; + LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/build/Release64\""; OTHER_CFLAGS = ( "$(WX_CFLAGS)", "$(FFMPEG_CFLAGS)",