mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-04-27 07:48:01 -07:00
add more comments
This commit is contained in:
parent
adbe686b94
commit
0e5a02ae53
2 changed files with 6 additions and 2 deletions
|
|
@ -134,6 +134,11 @@ if [[ $USE_VCPKG ]]; then
|
||||||
flags+=("-DUSE_VCPKG=1")
|
flags+=("-DUSE_VCPKG=1")
|
||||||
fi
|
fi
|
||||||
if [[ $TARGET_MACOS_VERSION ]]; then
|
if [[ $TARGET_MACOS_VERSION ]]; then
|
||||||
|
# CMAKE_OSX_DEPLOYMENT_TARGET is a vanilla cmake flag needed to compile to target macOS version
|
||||||
|
flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=${TARGET_MACOS_VERSION}")
|
||||||
|
|
||||||
|
# vcpkg dependencies need a vcpkg triplet file to compile to the target macOS version
|
||||||
|
# an easy way is to copy the x64-osx.cmake file and modify it
|
||||||
TRIPLETS_DIR="../cmake/triplets"
|
TRIPLETS_DIR="../cmake/triplets"
|
||||||
mkdir -p "$TRIPLETS_DIR"
|
mkdir -p "$TRIPLETS_DIR"
|
||||||
# Replace dots with hyphens in triplet name for vcpkg compatibility
|
# Replace dots with hyphens in triplet name for vcpkg compatibility
|
||||||
|
|
@ -144,7 +149,6 @@ if [[ $TARGET_MACOS_VERSION ]]; then
|
||||||
echo "set(VCPKG_OSX_DEPLOYMENT_TARGET ${TARGET_MACOS_VERSION})" >> "$TRIPLET_FILE"
|
echo "set(VCPKG_OSX_DEPLOYMENT_TARGET ${TARGET_MACOS_VERSION})" >> "$TRIPLET_FILE"
|
||||||
flags+=("-DVCPKG_OVERLAY_TRIPLETS=$TRIPLETS_DIR")
|
flags+=("-DVCPKG_OVERLAY_TRIPLETS=$TRIPLETS_DIR")
|
||||||
flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-${TRIPLET_VERSION}")
|
flags+=("-DVCPKG_TARGET_TRIPLET=x64-osx-${TRIPLET_VERSION}")
|
||||||
flags+=("-DCMAKE_OSX_DEPLOYMENT_TARGET=${TARGET_MACOS_VERSION}")
|
|
||||||
echo "::group::Generated triplet $TRIPLET_FILE"
|
echo "::group::Generated triplet $TRIPLET_FILE"
|
||||||
cat "$TRIPLET_FILE"
|
cat "$TRIPLET_FILE"
|
||||||
echo "::endgroup::"
|
echo "::endgroup::"
|
||||||
|
|
|
||||||
2
.github/workflows/desktop-build.yml
vendored
2
.github/workflows/desktop-build.yml
vendored
|
|
@ -4,7 +4,7 @@ permissions:
|
||||||
contents: write
|
contents: write
|
||||||
id-token: write
|
id-token: write
|
||||||
attestations: write
|
attestations: write
|
||||||
actions: write
|
actions: write # needed for ccache action to be able to delete gha caches
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue