Skip to content

Commit

Permalink
Update to latest vcpkg
Browse files Browse the repository at this point in the history
  • Loading branch information
cmaughan committed Oct 2, 2023
1 parent 69ff4c7 commit d4a8a48
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion libs/zest
2 changes: 1 addition & 1 deletion prebuild.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if not exist "vcpkg\vcpkg.exe" (

cd vcpkg
echo Installing Libraries
vcpkg install ableton-link tinydir cppcodec concurrentqueue portaudio stb fmt clipp tomlplusplus glm sdl2[vulkan] catch2 --triplet x64-windows-static-md --recurse
vcpkg install ableton-link tinydir cppcodec concurrentqueue portaudio stb fmt clipp glm sdl2[vulkan] catch2 --triplet x64-windows-static-md --recurse
cd %~dp0
echo %Time%

2 changes: 1 addition & 1 deletion prebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ if [ "$(uname)" == "Darwin" ]; then
fi

cd vcpkg
./vcpkg install ableton-link cppcodec tinydir concurrentqueue stb portaudio fmt clipp tomlplusplus glm sdl2[vulkan] catch2 --triplet ${triplet[0]} --recurse
./vcpkg install ableton-link cppcodec tinydir concurrentqueue stb portaudio fmt clipp glm sdl2[vulkan] catch2 --triplet ${triplet[0]} --recurse
if [ "$(uname)" != "Darwin" ]; then
./vcpkg install glib --triplet ${triplet[0]} --recurse
fi
Expand Down
2 changes: 0 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ project(Zing

find_package(glm CONFIG REQUIRED)
find_package(fmt CONFIG REQUIRED)
find_package(tomlplusplus CONFIG REQUIRED)
find_path(ABLETON_LINK_INCLUDE_DIRS "ableton/Link.hpp")

set(ZING_SF2_SOURCE
Expand Down Expand Up @@ -141,7 +140,6 @@ PUBLIC
$<BUILD_INTERFACE:${ZING_ROOT}/libs/remidi/include>
$<BUILD_INTERFACE:${ZING_ROOT}/libs>
$<BUILD_INTERFACE:${ZING_ROOT}/include>
$<BUILD_INTERFACE:${ZING_ROOT}/tomlplusplus/include>
$<BUILD_INTERFACE:${ABLETON_LINK_INCLUDE_DIRS}>
$<BUILD_INTERFACE:${SOUNDPIPE_DIR}/h>
$<BUILD_INTERFACE:${SOUNDPIPE_DIR}/lib/dr_wav>
Expand Down

0 comments on commit d4a8a48

Please sign in to comment.