diff --git a/config/guitard-mac.xcconfig b/config/guitard-mac.xcconfig index 76d2e36b..4e7a9993 100644 --- a/config/guitard-mac.xcconfig +++ b/config/guitard-mac.xcconfig @@ -17,14 +17,14 @@ BINARY_NAME = GuitarD // HEADER AND LIBRARY SEARCH PATHS EXTRA_INC_PATHS = $(IGRAPHICS_INC_PATHS) ../src/faust/generated ../thirdparty EXTRA_LIB_PATHS = $(IGRAPHICS_LIB_PATHS) -EXTRA_LNK_FLAGS = $(IGRAPHICS_LNK_FLAGS) $(BUILT_LIBS_LIB_PATH)/libssl.a $(BUILT_LIBS_LIB_PATH)/libcrypto.a +EXTRA_LNK_FLAGS = $(IGRAPHICS_LNK_FLAGS) //$(BUILT_LIBS_LIB_PATH)/libssl.a $(BUILT_LIBS_LIB_PATH)/libcrypto.a // EXTRA_APP_DEFS = // EXTRA_PLUGIN_DEFS = //------------------------------ // PREPROCESSOR MACROS -EXTRA_ALL_DEFS = OBJC_PREFIX=vGuitarD SWELL_APP_PREFIX=Swell_vGuitarD IGRAPHICS_SKIA IGRAPHICS_CPU WDL_RESAMPLE_TYPE=float FLOATCONV AUDIOFFT_APPLE_ACCELERATE +EXTRA_ALL_DEFS = OBJC_PREFIX=vGuitarD SWELL_APP_PREFIX=Swell_vGuitarD IGRAPHICS_SKIA IGRAPHICS_CPU FLOATCONV AUDIOFFT_APPLE_ACCELERATE //EXTRA_DEBUG_DEFS = //EXTRA_RELEASE_DEFS = //EXTRA_TRACER_DEFS = @@ -55,7 +55,7 @@ GCC_INCREASE_PRECOMPILED_HEADER_SHARING = NO GCC_CFLAGS = -Wno-write-strings -mfpmath=sse -msse -msse2 -msse3 //-mavx // Uncomment to enable relaxed IEEE compliance -//GCC_FAST_MATH = YES +GCC_FAST_MATH = YES // uncomment this to enable codesigning - necessary for AUv3 delivery //CODE_SIGN_IDENTITY=Mac Developer diff --git a/guitard.xcworkspace/xcuserdata/vm.xcuserdatad/UserInterfaceState.xcuserstate b/guitard.xcworkspace/xcuserdata/vm.xcuserdatad/UserInterfaceState.xcuserstate index f0b557de..8b8fbaf6 100644 Binary files a/guitard.xcworkspace/xcuserdata/vm.xcuserdatad/UserInterfaceState.xcuserstate and b/guitard.xcworkspace/xcuserdata/vm.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/projects/guitard-iOS.xcodeproj/project.pbxproj b/projects/guitard-iOS.xcodeproj/project.pbxproj index fd28eab5..a536cdb7 100644 --- a/projects/guitard-iOS.xcodeproj/project.pbxproj +++ b/projects/guitard-iOS.xcodeproj/project.pbxproj @@ -656,12 +656,12 @@ LastUpgradeCheck = 1030; TargetAttributes = { 4FA61F6D22E899B500A92C58 = { - DevelopmentTeam = 686EDA2T8T; + DevelopmentTeam = XKMCM5DHUB; ProvisioningStyle = Automatic; }; 91236D0C1B08F42B00734C5E = { CreatedOnToolsVersion = 7.0; - DevelopmentTeam = 686EDA2T8T; + DevelopmentTeam = XKMCM5DHUB; LastSwiftMigration = 1010; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { @@ -677,7 +677,7 @@ }; 91236D761B08F59300734C5E = { CreatedOnToolsVersion = 7.0; - DevelopmentTeam = 686EDA2T8T; + DevelopmentTeam = XKMCM5DHUB; LastSwiftMigration = 1010; SystemCapabilities = { com.apple.ApplicationGroups.iOS = { diff --git a/projects/guitard-macOS.xcodeproj/project.pbxproj b/projects/guitard-macOS.xcodeproj/project.pbxproj index c5ef99d4..2e817edc 100644 --- a/projects/guitard-macOS.xcodeproj/project.pbxproj +++ b/projects/guitard-macOS.xcodeproj/project.pbxproj @@ -3136,6 +3136,8 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = XKMCM5DHUB; DSTROOT = "$(AU_PATH)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3165,6 +3167,8 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = XKMCM5DHUB; DSTROOT = "$(AU_PATH)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3194,6 +3198,8 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = XKMCM5DHUB; DSTROOT = "$(AU_PATH)"; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -3374,6 +3380,7 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CODE_SIGN_IDENTITY = "Apple Development"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 1; @@ -3895,6 +3902,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_ENTITLEMENTS = "GuitarD-macOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = XKMCM5DHUB; DSTROOT = "$(APP_PATH)"; ENABLE_HARDENED_RUNTIME = YES; @@ -3924,6 +3932,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_ENTITLEMENTS = "GuitarD-macOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = XKMCM5DHUB; DSTROOT = "$(APP_PATH)"; ENABLE_HARDENED_RUNTIME = YES; @@ -3953,6 +3962,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_ENTITLEMENTS = "GuitarD-macOS.entitlements"; CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; DEVELOPMENT_TEAM = XKMCM5DHUB; DSTROOT = "$(APP_PATH)"; ENABLE_HARDENED_RUNTIME = YES; diff --git a/scripts/makedist-mac.sh b/scripts/makedist-mac.sh index 774ee84b..b6c4b855 100755 --- a/scripts/makedist-mac.sh +++ b/scripts/makedist-mac.sh @@ -34,7 +34,7 @@ PLUGIN_NAME=`echo | grep BUNDLE_NAME config.h` PLUGIN_NAME=${PLUGIN_NAME//\#define BUNDLE_NAME } PLUGIN_NAME=${PLUGIN_NAME//\"} -DMG_NAME=$PLUGIN_NAME-v$FULL_VERSION-mac +DMG_NAME=$PLUGIN_NAME-mac if [ $DEMO == 1 ] then @@ -80,7 +80,7 @@ echo "" #--------------------------------------------------------------------------------------------------------- -./scripts/update_installer_version.py $DEMO +# ./scripts/update_installer_version.py $DEMO echo "touching source to force recompile" touch *.cpp @@ -130,7 +130,8 @@ fi # build xcode project. Change target to build individual formats -xcodebuild -project ./projects/$PLUGIN_NAME-macOS.xcodeproj -xcconfig ./config/$PLUGIN_NAME-mac.xcconfig DEMO_VERSION=$DEMO -target "All" -configuration Release 2> ./build-mac.log +xcodebuild -project ./projects/$PLUGIN_NAME-macOS.xcodeproj -xcconfig ./config/$PLUGIN_NAME-mac.xcconfig DEMO_VERSION=$DEMO -target "APP" -configuration Release 2> ./build-mac.log +xcodebuild -project ./projects/$PLUGIN_NAME-macOS.xcodeproj -xcconfig ./config/$PLUGIN_NAME-mac.xcconfig DEMO_VERSION=$DEMO -target "AU" -configuration Release 2> ./build-mac.log if [ -s build-mac.log ] then @@ -148,9 +149,7 @@ fi echo "setting icons" echo "" setfileicon resources/$PLUGIN_NAME.icns $AU -setfileicon resources/$PLUGIN_NAME.icns $VST2 -setfileicon resources/$PLUGIN_NAME.icns $VST3 -setfileicon resources/$PLUGIN_NAME.icns "${AAX}" +# setfileicon resources/$PLUGIN_NAME.icns $VST3 #--------------------------------------------------------------------------------------------------------- @@ -158,22 +157,9 @@ setfileicon resources/$PLUGIN_NAME.icns "${AAX}" echo "stripping binaries" strip -x $AU/Contents/Resources/plugin.vst3/Contents/MacOS/$PLUGIN_NAME -strip -x $VST2/Contents/MacOS/$PLUGIN_NAME -strip -x $VST3/Contents/MacOS/$PLUGIN_NAME +# strip -x $VST3/Contents/MacOS/$PLUGIN_NAME strip -x $APP/Contents/MacOS/$PLUGIN_NAME -strip -x "${AAX}/Contents/MacOS/$PLUGIN_NAME" -#--------------------------------------------------------------------------------------------------------- - -#ProTools stuff -echo "copying AAX ${PLUGIN_NAME} from 3PDev to main AAX folder" -sudo cp -p -R "${AAX}" "${AAX_FINAL}" -mkdir "${AAX_FINAL}/Contents/Factory Presets/" - -echo "code sign AAX binary" -/Applications/PACEAntiPiracy/Eden/Fusion/Current/bin/wraptool sign --verbose --account XXXX --wcguid XXXX --signid "Developer ID Application: ""${CERT_ID}" --in "${AAX_FINAL}" --out "${AAX_FINAL}" - -#--------------------------------------------------------------------------------------------------------- #Mac AppStore stuff @@ -215,7 +201,7 @@ productsign --sign "Developer ID Installer: ""${CERT_ID}" "${PKG_US}" "${PKG}" rm -R -f "${PKG_US}" #set installer icon -setfileicon resources/$PLUGIN_NAME.icns "${PKG}" +#setfileicon resources/$PLUGIN_NAME.icns "${PKG}" #---------------------------------------------------------------------------------------------------------