diff --git a/.gitmodules b/.gitmodules index fa98c758..aaaa1fd8 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "third_party/glm"] path = third_party/glm url = https://github.com/g-truc/glm +[submodule "third_party/soloud"] + path = third_party/soloud + url = https://github.com/jarikomppa/soloud diff --git a/CMakeLists.txt b/CMakeLists.txt index 571bff87..62728376 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,6 +51,16 @@ add_subdirectory(third_party/glm) add_subdirectory(third_party/stb) +set(SDL2_LIBRARY SDL2) +set(SDL2_INCLUDE_DIR SDL2) +add_subdirectory(third_party/soloud/contrib) +unset(SDL2_LIBRARY) +unset(SDL2_INCLUDE_DIR) +target_include_directories( + soloud PUBLIC + $ +) + set_target_properties( bgfx bimg bx chipmunk_static PROPERTIES POSITION_INDEPENDENT_CODE ON diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index fddaf5d5..c0723c66 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -175,7 +175,7 @@ target_include_directories(kaacore PUBLIC target_link_libraries( kaacore PUBLIC - SDL2 SDL_mixer bgfx chipmunk_static glm $ + SDL2 SDL_mixer bgfx chipmunk_static glm soloud $ stb $ ) diff --git a/third_party/soloud b/third_party/soloud new file mode 160000 index 00000000..17c9fd4d --- /dev/null +++ b/third_party/soloud @@ -0,0 +1 @@ +Subproject commit 17c9fd4ddbda9a169ca1d2d822ec37cd4c6507e0