now with DAS_AUDIO

.gitmodules

@@ -10,9 +10,6 @@
 [submodule "modules/dasXbyak"]
 	path = modules/dasXbyak
 	url = https://github.com/borisbat/dasXbyak.git
-[submodule "modules/dasSound"]
-	path = modules/dasSound
-	url = https://github.com/imp5imp5/dasSound.git
 [submodule "modules/dasMinfft"]
 	path = modules/dasMinfft
 	url = https://github.com/imp5imp5/dasMinfft.git

CMakeLists.txt

@@ -11,7 +11,7 @@ option(DAS_IMGUI_DISABLED "Disable dasIMGUI (IMGUI, IMNODES, IMGUI-NODE-EDITOR g
 option(DAS_BGFX_DISABLED "Disable dasBGFX (BGFX graphics API)" ON)
 option(DAS_XBYAK_DISABLED "Disable dasXbyak (XBYAK and ZYDIS, x86 assembly, jit)" ON)
 option(DAS_MINFFT_DISABLED "Disable dasMinfft (Minimal FFT library)" ON)
-option(DAS_SOUND_DISABLED "Disable dasSound (Miniaudio sound library)" ON)
+option(DAS_AUDIO_DISABLED "Disable dasAudio (Miniaudio sound library)" ON)
 option(DAS_STDDLG_DISABLED "Disable dasStdDlg (File new,open,save etc dialogs)" OFF)
 option(DAS_STBIMAGE_DISABLED "Disable dasStbImage (StbImage bindings, image loading and saving)" OFF)
 option(DAS_STBTRUETYPE_DISABLED "Disable dasStbTrueType (StbTrueType bindings, ttf rasterization)" OFF)

generate_gcc_linux_min.sh

@@ -13,7 +13,7 @@ CC=gcc-9 CXX=g++-9 cmake -DCMAKE_OSX_ARCHITECTURES="x86_64" \
         -DDAS_LLVM_DISABLED:BOOL=TRUE           \
         -DDAS_QUIRREL_DISABLED:BOOL=TRUE           \
         -DDAS_MINFFT_DISABLED:BOOL=TRUE         \
-        -DDAS_SOUND_DISABLED:BOOL=TRUE          \
+        -DDAS_AUDIO_DISABLED:BOOL=TRUE          \
         -DDAS_STDDLG_DISABLED:BOOL=TRUE         \
         -DDAS_STBIMAGE_DISABLED:BOOL=TRUE       \
         -DDAS_STBTRUETYPE_DISABLED:BOOL=TRUE    \

generate_xcode_min.sh

@@ -14,7 +14,7 @@ time {
         -DDAS_CLANG_BIND_DISABLED:BOOL=TRUE     \
         -DDAS_LLVM_DISABLED:BOOL=TRUE           \
         -DDAS_MINFFT_DISABLED:BOOL=TRUE         \
-        -DDAS_SOUND_DISABLED:BOOL=TRUE          \
+        -DDAS_AUDIO_DISABLED:BOOL=TRUE          \
         -DDAS_STDDLG_DISABLED:BOOL=TRUE         \
         -DDAS_STBIMAGE_DISABLED:BOOL=TRUE       \
         -DDAS_STBTRUETYPE_DISABLED:BOOL=TRUE    \

modules.py

@@ -17,7 +17,7 @@
     "dasOpenGL":      "",
     "dasQuirrel":     "DAS_QUIRREL_DISABLED",
     "dasSFML":        "DAS_SFML_DISABLED",
-    "dasSound":       "DAS_SOUND_DISABLED",
+    "dasAudio":       "DAS_AUDIO_DISABLED",
     "dasStbImage":    "DAS_STBIMAGE_DISABLED",
     "dasStbTrueType": "DAS_STBTRUETYPE_DISABLED",
     "dasStdDlg":      "DAS_STDDLG_DISABLED",

modules/dasAudio/CMakeLists.txt

@@ -0,0 +1,54 @@
+
+IF ((NOT DAS_AUDIO_INCLUDED) AND ((NOT ${DAS_AUDIO_DISABLED}) OR (NOT DEFINED DAS_AUDIO_DISABLED)))
+    SET(DAS_AUDIO_INCLUDED TRUE)
+    MESSAGE(STATUS "dasAudio module included.")
+
+	SET(DAS_AUDIO_DIR ${PROJECT_SOURCE_DIR}/modules/dasAudio)
+	SET(SOUND_INCLUDE_DIR ${DAS_AUDIO_DIR}/src ${DAS_AUDIO_DIR}/miniaudio)
+
+    LIST(APPEND CMAKE_MODULE_PATH ${DAS_AUDIO_DIR})
+
+	SET(NUKED_OPL3_INCLUDE_DIR ${DAS_AUDIO_DIR}/Nuked-OPL3)
+
+	SET(NUKED_OPL3_SOURCE
+		${NUKED_OPL3_INCLUDE_DIR}/opl3.h
+		${NUKED_OPL3_INCLUDE_DIR}/opl3.c
+	)
+
+	# libDasModuleSound
+	SET(DAS_AUDIO_MODULE_SRC
+		${DAS_AUDIO_DIR}/src/dasAudio.h
+		${DAS_AUDIO_DIR}/src/dasAudio.cpp
+	)
+
+	ADD_MODULE_LIB(libDasModuleSound)
+	ADD_MODULE_CPP(Audio)
+	# ADD_MODULE_NATIVE(SOUND_boost)
+	ADD_LIBRARY(libDasModuleSound ${DAS_AUDIO_MODULE_SRC} ${DAS_AUDIO_MODULE_PLATFORM_SRC} ${NUKED_OPL3_SOURCE})
+	TARGET_LINK_LIBRARIES(libDasModuleSound ${SOUND_LIBRARIES})
+	# ADD_DEPENDENCIES(libDasModuleSound)
+	TARGET_INCLUDE_DIRECTORIES(libDasModuleSound PUBLIC ${SOUND_INCLUDE_DIR} ${NUKED_OPL3_INCLUDE_DIR})
+
+	SETUP_CPP11(libDasModuleSound)
+
+    #ADD_MODULE_DAS(medialib medialib dasbox_sound_utils)
+	ADD_MODULE_DAS(audio audio opl3)
+	ADD_MODULE_DAS(audio audio audio_boost)
+
+    install(DIRECTORY ${PROJECT_SOURCE_DIR}/modules/dasAudio/medialib
+        DESTINATION modules/dasAudio
+        FILES_MATCHING
+        PATTERN "*.das"
+    )
+
+    file(GLOB DAS_AUDIO_EXAMPLES
+        ${PROJECT_SOURCE_DIR}/modules/dasAudio/examples/*.das
+    )
+    install(FILES ${DAS_AUDIO_EXAMPLES}
+        DESTINATION examples/audio
+    )
+
+	install(FILES ${PROJECT_SOURCE_DIR}/modules/dasAudio/miniaudio/LICENSE DESTINATION . RENAME MINIAUDIO.LICENSE)
+	install(FILES ${PROJECT_SOURCE_DIR}/modules/dasAudio/Nuked-OPL3/LICENSE DESTINATION . RENAME NUKED-OPL3.LICENSE)
+
+ENDIF()