Skip to content

Commit

Permalink
Merge pull request #144 from Laerdal/ksidirop/MAN-420-fix-build-error…
Browse files Browse the repository at this point in the history
…-concerning-mac-catalyst-sdk-version

[MAN-420] Fix build error concerning mac catalyst sdk version
  • Loading branch information
ksidirop-laerdal authored Oct 3, 2024
2 parents c4a9776 + d20552e commit 96f2161
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
BeforeTargets="PrepareForBuild"
Condition=" '$(ShouldBuildNativeLibraries)' == 'true' and '$(DesignTimeBuild)' != 'true' and '$(BuildingProject)' == 'true' ">

<!-- 1. build and generate the fat libs from the proxy swift project -->
<!-- 1. build and generate the fat libs from the proxy swift project -->
<Exec WorkingDirectory="../Laerdal.McuMgr.Bindings.MacCatalystAndIos.Native" Command=" bash -c &quot; chmod +x ./Laerdal.Mac.CompileAndGenerateFatLibs.sh &quot; "/>

<PropertyGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 96f2161

Please sign in to comment.