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

Jump to bottom

Original music #393

Merged
merged 7 commits into from
Jul 16, 2024
Merged

Original music #393

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3d0b725
adds support for GOG-format music ogg files
dethrace-labs Jul 12, 2024
74d7442
remove -wall
dethrace-labs Jul 13, 2024
8619ec9
remove -werror for harness
dethrace-labs Jul 13, 2024
f978dce
Update src/DETHRACE/common/sound.c
dethrace-labs Jul 14, 2024
c491b8c
fix build
dethrace-labs Jul 14, 2024
3183078
Merge branch 'main' into cd_audio
dethrace-labs Jul 14, 2024
c7218f2
adds -Werror back to harness
dethrace-labs Jul 16, 2024
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
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ endif()
add_subdirectory(lib/BRender-v1.3.2)
add_subdirectory(lib/libsmacker)
add_subdirectory(lib/miniaudio)
add_subdirectory(lib/stb)

add_library(compile_with_werror INTERFACE)

Expand Down
20 changes: 3 additions & 17 deletions lib/miniaudio/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
add_library(miniaudio STATIC)
add_library(miniaudio INTERFACE)

target_include_directories(miniaudio
PUBLIC
target_include_directories(miniaudio
INTERFACE
include
PRIVATE
include/miniaudio

)

target_sources(miniaudio PRIVATE
miniaudio.c

)

if (CMAKE_C_COMPILER_ID MATCHES "Clang")
target_compile_options(miniaudio PRIVATE
-Wno-deprecated-declarations
)
endif()
97,803 changes: 91,436 additions & 6,367 deletions lib/miniaudio/include/miniaudio/miniaudio.h
View file
Open in desktop

Large diffs are not rendered by default.

Loading