Skip to content

Commit

Permalink
Make local MSVC build independent of builtin-baseline
Browse files Browse the repository at this point in the history
Co-Authored-By: pvictress <[email protected]>
  • Loading branch information
JNechaevsky and pvictress committed Nov 7, 2024
1 parent 70387a1 commit 1ca6c5d
Show file tree
Hide file tree
Showing 4 changed files with 23 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] sdl2-net libsamplerate fluidsynth --triplet x64-windows-static-release --overlay-triplets=cmake/triplets
- name: Configure CMake
run: |
Expand Down
9 changes: 9 additions & 0 deletions cmake/triplets/x64-linux-dynamic-release.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
set(VCPKG_TARGET_ARCHITECTURE x64)
set(VCPKG_CRT_LINKAGE dynamic)
set(VCPKG_LIBRARY_LINKAGE dynamic)

set(VCPKG_CMAKE_SYSTEM_NAME Linux)

set(VCPKG_FIXUP_ELF_RPATH ON)

set(VCPKG_BUILD_TYPE release)
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 @@ -10,11 +10,5 @@
"sdl2-net",
"libsamplerate",
"fluidsynth"
],
"overrides": [
{
"name": "triplet",
"version-string": "x64-windows-static-release"
}
]
}

0 comments on commit 1ca6c5d

Please sign in to comment.