Update the auto setup script to build ZMusic with vcpkg as well

This commit is contained in:
Cacodemon345 2023-08-26 00:43:37 +06:00 committed by Rachael Alexanderson
parent ccd39d6df7
commit 948e7cd649
2 changed files with 8 additions and 3 deletions

View file

@ -62,14 +62,19 @@ if exist zmusic if exist vcpkg\* git -C ./zmusic pull
if not exist zmusic git clone https://github.com/zdoom/zmusic
mkdir "%~dp0\build\zmusic\build"
mkdir "%~dp0\build\vcpkg_installed"
cmake -A x64 -S ./zmusic -B ./zmusic/build
cmake -A x64 -S ./zmusic -B ./zmusic/build ^
-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake ^
-DVCPKG_LIBSNDFILE=1 ^
-DVCPKG_INSTALLLED_DIR=./vcpkg_installed/
cmake --build ./zmusic/build --config Release -- -maxcpucount -verbosity:minimal
cmake -A x64 -S .. -B . ^
-DCMAKE_TOOLCHAIN_FILE=./vcpkg/scripts/buildsystems/vcpkg.cmake ^
-DZMUSIC_INCLUDE_DIR=./zmusic/include ^
-DZMUSIC_LIBRARIES=./zmusic/build/source/Release/zmusic.lib
-DZMUSIC_LIBRARIES=./zmusic/build/source/Release/zmusic.lib ^
-DVCPKG_INSTALLLED_DIR=./vcpkg_installed/
cmake --build . --config RelWithDebInfo -- -maxcpucount -verbosity:minimal
rem -- If successful, show the build

View file

@ -1,6 +1,6 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"builtin-baseline": "9d47b24eacbd1cd94f139457ef6cd35e5d92cc84",
"builtin-baseline": "65c013b9667ff1f58fb8724209227e5a2e761043",
"features":
{
"vcpkg-libvpx":