diff options
| author | jaroWMR <jarorutjes07@gmail.com> | 2024-10-10 07:35:17 +0200 |
|---|---|---|
| committer | jaroWMR <jarorutjes07@gmail.com> | 2024-10-10 07:35:17 +0200 |
| commit | 127e457dda1a1c7b32315a920c80aa4c13ddb840 (patch) | |
| tree | a64d70d40595955437aa9baff917df5a7d087d9b /src | |
| parent | f1e830392b084be776286a61409d0e4a2755c2cf (diff) | |
| parent | 44208336d80dd63735215ee2cafb3e73fa03f930 (diff) | |
merge with master
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 13 | ||||
| -rw-r--r-- | src/crepe/Sound.h | 4 | ||||
| -rw-r--r-- | src/crepe/SoundContext.h | 2 |
3 files changed, 9 insertions, 10 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 9c508a8..f6afdc0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -5,12 +5,12 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_EXPORT_COMPILE_COMMANDS 1) set(CMAKE_BUILD_TYPE Debug) -add_subdirectory(../lib/soloud soloud) -add_subdirectory(../lib/googletest googletest) -add_subdirectory(../lib/sdl2 sdl2) - project(crepe C CXX) +find_package(SDL2 REQUIRED) +find_package(SoLoud REQUIRED) +find_package(GTest REQUIRED) + add_library(crepe SHARED) add_executable(test_main EXCLUDE_FROM_ALL) @@ -18,10 +18,9 @@ target_include_directories(crepe PUBLIC SYSTEM INTERFACE . ) -# TODO: libraries should be linked as PRIVATE target_link_libraries(crepe - PUBLIC soloud - PUBLIC sdl2 + PRIVATE soloud + PRIVATE SDL2 ) add_subdirectory(crepe) diff --git a/src/crepe/Sound.h b/src/crepe/Sound.h index 1ac20a7..b7cfbb8 100644 --- a/src/crepe/Sound.h +++ b/src/crepe/Sound.h @@ -1,7 +1,7 @@ #pragma once -#include <soloud.h> -#include <soloud_wav.h> +#include <soloud/soloud.h> +#include <soloud/soloud_wav.h> #include <memory> diff --git a/src/crepe/SoundContext.h b/src/crepe/SoundContext.h index 090966d..d3123d2 100644 --- a/src/crepe/SoundContext.h +++ b/src/crepe/SoundContext.h @@ -1,6 +1,6 @@ #pragma once -#include <soloud.h> +#include <soloud/soloud.h> #include "Sound.h" |