Skip to content

initial work on integrating SoLoud #81

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

Draft
labuzm wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

initial work on integrating SoLoud #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c63428b
initial work on integrating SoLoud
labuzm Aug 13, 2020
4936b35
modify cmake
labuzm Aug 25, 2020
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
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 10 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/third_party/soloud/include>
)

set_target_properties(
bgfx bimg bx chipmunk_static
PROPERTIES POSITION_INDEPENDENT_CODE ON
Expand Down
2 changes: 1 addition & 1 deletion src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ target_include_directories(kaacore PUBLIC

target_link_libraries(
kaacore PUBLIC
SDL2 SDL_mixer bgfx chipmunk_static glm $<TARGET_OBJECTS:SDL_mixer>
SDL2 SDL_mixer bgfx chipmunk_static glm soloud $<TARGET_OBJECTS:SDL_mixer>
stb $<TARGET_OBJECTS:stb>
)

Expand Down
1 change: 1 addition & 0 deletions third_party/soloud
Open in desktop
Submodule soloud added at 17c9fd