Skip to content

Commit

Permalink
Make local MSVC build independent of builtin-baseline (#21)
Browse files Browse the repository at this point in the history
* Better local build

* Proper branch

* Remove vcpkg.json for classic mode

* Bash shell

* Go to main branch
  • Loading branch information
JNechaevsky authored Nov 7, 2024
1 parent e92b23b commit 29ad8b1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 7 deletions.
9 changes: 8 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,16 @@ jobs:
run: |
.\vcpkg\bootstrap-vcpkg.bat
- name: Remove vcpkg.json for classic mode
shell: bash
run: |
if [ -f "vcpkg.json" ]; then
rm "vcpkg.json"
fi
- name: Install Dependencies with vcpkg
run: |
.\vcpkg\vcpkg.exe install --overlay-triplets=cmake/triplets --triplet=x64-windows-static-release
.\vcpkg\vcpkg.exe install sdl2 sdl2-mixer[libflac,libmodplug,mpg123,opusfile] libsamplerate --triplet x64-windows-static-release --overlay-triplets=cmake/triplets
- name: Configure CMake
run: |
Expand Down
6 changes: 6 additions & 0 deletions cmake/triplets/x64-windows-static-release.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
set(VCPKG_TARGET_TRIPLET "x64-windows-static-release")
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE static)
set(VCPKG_LIBRARY_LINKAGE static)

set(VCPKG_BUILD_TYPE release)
6 changes: 0 additions & 6 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,5 @@
"features": [ "libflac", "libmodplug", "mpg123", "opusfile" ]
},
"libsamplerate"
],
"overrides": [
{
"name": "triplet",
"version-string": "x64-windows-static-release"
}
]
}

0 comments on commit 29ad8b1

Please sign in to comment.