Original music (#393)

* adds support for GOG-format music ogg files --------- Co-authored-by: Anonymous Maarten <madebr@users.noreply.github.com>
dethrace-labs · Jul 16, 2024 · 6e6ce12 · 6e6ce12
1 parent a48c47b
commit 6e6ce12
Show file tree

Hide file tree

Showing 22 changed files with 97,503 additions and 87,617 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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)
 

diff --git a/lib/libsmacker/CMakeLists.txt b/lib/libsmacker/CMakeLists.txt
@@ -10,8 +10,9 @@ project(libsmacker C)
 
 add_library(libsmacker STATIC)
 
-target_include_directories(libsmacker PUBLIC
-    .
+target_include_directories(libsmacker
+    SYSTEM PUBLIC
+        .
 )
 
 if(NOT MSVC)

diff --git a/lib/miniaudio/CMakeLists.txt b/lib/miniaudio/CMakeLists.txt
@@ -1,20 +1,6 @@
-add_library(miniaudio STATIC)
+add_library(miniaudio INTERFACE)
 
-target_include_directories(miniaudio 
-    PUBLIC
+target_include_directories(miniaudio
+    SYSTEM 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()
diff --git a/lib/miniaudio/include/miniaudio/miniaudio.h b/lib/miniaudio/include/miniaudio/miniaudio.h