Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

API - drop unused dependency: crossguid #3427

Merged
merged 1 commit into from
Nov 11, 2024
Merged

API - drop unused dependency: crossguid #3427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions app/api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
4 changes: 0 additions & 4 deletions app/api/src/sonicpi_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@
#include <api/scope_exit.h>
#include <api/sonicpi_api.h>

#ifndef __APPLE__
#include <crossguid/guid.hpp>
#endif

using namespace std::chrono;
using namespace oscpkt;

Expand Down
4 changes: 2 additions & 2 deletions app/linux-pre-vcpkg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down
2 changes: 1 addition & 1 deletion app/mac-pre-vcpkg.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion app/win-pre-vcpkg.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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%
Loading