From d20552e4766629c51681687184a57142aae4362d Mon Sep 17 00:00:00 2001 From: Kyriakos Sidiropoulos Date: Thu, 3 Oct 2024 11:53:24 +0200 Subject: [PATCH] fix (Laerdal.Mac.CompileAndGenerateFatLibs.sh): fix a bug which sneaked in recently causing the mac-catalyst build to fail due to the output dir-path being off --- .../Laerdal.McuMgr.Bindings.MacCatalyst.csproj | 2 +- .../Laerdal.Mac.CompileAndGenerateFatLibs.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj b/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj index 460991f..6aa4f93 100644 --- a/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj +++ b/Laerdal.McuMgr.Bindings.MacCatalyst/Laerdal.McuMgr.Bindings.MacCatalyst.csproj @@ -166,7 +166,7 @@ BeforeTargets="PrepareForBuild" Condition=" '$(ShouldBuildNativeLibraries)' == 'true' and '$(DesignTimeBuild)' != 'true' and '$(BuildingProject)' == 'true' "> - + diff --git a/Laerdal.McuMgr.Bindings.MacCatalystAndIos.Native/Laerdal.Mac.CompileAndGenerateFatLibs.sh b/Laerdal.McuMgr.Bindings.MacCatalystAndIos.Native/Laerdal.Mac.CompileAndGenerateFatLibs.sh index 4bd7777..88c6ecb 100755 --- a/Laerdal.McuMgr.Bindings.MacCatalystAndIos.Native/Laerdal.Mac.CompileAndGenerateFatLibs.sh +++ b/Laerdal.McuMgr.Bindings.MacCatalystAndIos.Native/Laerdal.Mac.CompileAndGenerateFatLibs.sh @@ -35,7 +35,7 @@ declare SWIFT_PACKAGES_PATH="./packages" declare OUTPUT_FOLDER_POSTFIX="" if [ "${XCODEBUILD_TARGET_SDK}" == "macosx" ]; then - OUTPUT_FOLDER_POSTFIX="" # special case for mac catalyst sdk 15.2 wanted this to be "-maccatalyst" but sdk 15.4 wants it to be empty go figure ... + OUTPUT_FOLDER_POSTFIX="-maccatalyst" # special case for mac catalyst else OUTPUT_FOLDER_POSTFIX="-${XCODEBUILD_TARGET_SDK}" fi