From 4e919ef4f6ed59c2e78de58c4bd16fb5ca57dbe0 Mon Sep 17 00:00:00 2001 From: Valentin Vidic Date: Mon, 11 Nov 2024 23:52:52 +0100 Subject: [PATCH] API - drop unused dependency: crossguid Seems like the library was linked but never called since commit 8793eaba8785018debf2eea274e8f196a9527c87: Daemon - evolve kill token into a more general comms token --- app/api/CMakeLists.txt | 4 ---- app/api/src/sonicpi_api.cpp | 4 ---- app/linux-pre-vcpkg.sh | 4 ++-- app/mac-pre-vcpkg.sh | 2 +- app/win-pre-vcpkg.bat | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/app/api/CMakeLists.txt b/app/api/CMakeLists.txt index 3619aec141..b9b465378b 100644 --- a/app/api/CMakeLists.txt +++ b/app/api/CMakeLists.txt @@ -87,22 +87,18 @@ endif() # Windows if ("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows") -find_package(crossguid CONFIG REQUIRED) target_link_libraries(${PROJECT_NAME} PRIVATE - crossguid ) endif() # Linux if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") -find_package(crossguid CONFIG REQUIRED) target_link_libraries(${PROJECT_NAME} PUBLIC stdc++fs rt PRIVATE - crossguid ) endif() diff --git a/app/api/src/sonicpi_api.cpp b/app/api/src/sonicpi_api.cpp index dad686d2a9..4c1f1428e9 100644 --- a/app/api/src/sonicpi_api.cpp +++ b/app/api/src/sonicpi_api.cpp @@ -27,10 +27,6 @@ #include #include -#ifndef __APPLE__ -#include -#endif - using namespace std::chrono; using namespace oscpkt; diff --git a/app/linux-pre-vcpkg.sh b/app/linux-pre-vcpkg.sh index 60f0567e4a..ae480c3795 100755 --- a/app/linux-pre-vcpkg.sh +++ b/app/linux-pre-vcpkg.sh @@ -51,9 +51,9 @@ fi cd vcpkg if [ "$no_imgui" == true ]; then - ./vcpkg install libsndfile[core,external-libs] kissfft crossguid platform-folders reproc catch2 --recurse + ./vcpkg install libsndfile[core,external-libs] kissfft platform-folders reproc catch2 --recurse else - ./vcpkg install libsndfile[core,external-libs] kissfft fmt crossguid sdl2[x11] gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --recurse + ./vcpkg install libsndfile[core,external-libs] kissfft fmt sdl2[x11] gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --recurse fi diff --git a/app/mac-pre-vcpkg.sh b/app/mac-pre-vcpkg.sh index cec7800327..ceb68e5710 100755 --- a/app/mac-pre-vcpkg.sh +++ b/app/mac-pre-vcpkg.sh @@ -63,7 +63,7 @@ fi if [ "$no_imgui" == true ]; then - ./vcpkg install libsndfile[core,external-libs] kissfft crossguid platform-folders reproc catch2 --triplet ${triplet[0]} --recurse + ./vcpkg install libsndfile[core,external-libs] kissfft platform-folders reproc catch2 --triplet ${triplet[0]} --recurse else ./vcpkg install libsndfile[core,external-libs] kissfft fmt sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --triplet ${triplet[0]} --recurse fi diff --git a/app/win-pre-vcpkg.bat b/app/win-pre-vcpkg.bat index 414ab75779..692881be7f 100755 --- a/app/win-pre-vcpkg.bat +++ b/app/win-pre-vcpkg.bat @@ -19,6 +19,6 @@ if not exist "vcpkg\vcpkg.exe" ( cd vcpkg @echo Installing Libraries -vcpkg install libsndfile[core,external-libs] kissfft fmt crossguid sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --triplet x64-windows-static-md --recurse +vcpkg install libsndfile[core,external-libs] kissfft fmt sdl2 gl3w reproc gsl-lite concurrentqueue platform-folders catch2 --triplet x64-windows-static-md --recurse cd %WORKING_DIR%