From c738ae9993f6be0a4ac83490ed177d6f468f1e1e Mon Sep 17 00:00:00 2001
From: bjorn <tie.372@gmail.com>
Date: Fri, 20 Nov 2020 20:47:38 -0700
Subject: [PATCH] Update CMake/deps;

---
 CMakeLists.txt   | 39 ++-------------------------------------
 deps/openal-soft |  1 -
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 160000 deps/openal-soft

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e686a69..ed7e653f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,6 @@ option(LOVR_USE_LINUX_EGL "Use the EGL graphics extension on Linux" OFF)
 option(LOVR_SYSTEM_GLFW "Use the system-provided glfw" OFF)
 option(LOVR_SYSTEM_LUA "Use the system-provided Lua" OFF)
 option(LOVR_SYSTEM_ODE "Use the system-provided ODE" OFF)
-option(LOVR_SYSTEM_OPENAL "Use the system-provided OpenAL" OFF)
 option(LOVR_SYSTEM_OPENXR "Use the system-provided OpenXR" OFF)
 
 option(LOVR_BUILD_EXE "Build an executable (or an apk on Android)" ON)
@@ -152,35 +151,6 @@ if(LOVR_ENABLE_PHYSICS)
   endif()
 endif()
 
-# OpenAL
-if(LOVR_ENABLE_AUDIO)
-  if(LOVR_SYSTEM_OPENAL)
-    pkg_search_module(OPENAL openal-soft)
-    if (NOT OPENAL_FOUND)
-      pkg_search_module(OPENAL openal)
-      if (NOT OPENAL_FOUND)
-        message(FATAL_ERROR "OpenAL not found.")
-      endif()
-    endif()
-    include_directories(${OPENAL_INCLUDE_DIRS})
-    string(REPLACE ";" " " OPENAL_LDFLAGS_STR "${OPENAL_LDFLAGS}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OPENAL_LDFLAGS_STR}")
-    set(LOVR_OPENAL ${OPENAL_LIBRARIES})
-  else()
-    set(ALSOFT_UTILS OFF CACHE BOOL "")
-    set(ALSOFT_EXAMPLES OFF CACHE BOOL "")
-    set(ALSOFT_TESTS OFF CACHE BOOL "")
-    if(NOT EMSCRIPTEN)
-      add_subdirectory(deps/openal-soft openal)
-      set(LOVR_OPENAL OpenAL)
-      if(WIN32)
-        set_target_properties(OpenAL PROPERTIES COMPILE_FLAGS "/wd4005 /wd4098")
-      endif()
-    endif()
-    include_directories(deps/openal-soft/include)
-  endif()
-endif()
-
 # OpenGL
 if(NOT (WIN32 OR EMSCRIPTEN OR ANDROID))
   find_package(OpenGL REQUIRED)
@@ -325,7 +295,6 @@ target_link_libraries(lovr
   ${LOVR_LUA}
   ${LOVR_MSDF}
   ${LOVR_ODE}
-  ${LOVR_OPENAL}
   ${LOVR_OPENGL}
   ${LOVR_OPENVR}
   ${LOVR_OPENXR}
@@ -341,7 +310,7 @@ if(LOVR_ENABLE_AUDIO)
     src/modules/audio/audio.c
     src/api/l_audio.c
     src/api/l_audio_source.c
-    src/api/l_audio_microphone.c
+    src/lib/miniaudio/miniaudio.c
   )
 else()
   target_compile_definitions(lovr PRIVATE LOVR_DISABLE_AUDIO)
@@ -349,7 +318,6 @@ endif()
 
 if(LOVR_ENABLE_DATA)
   target_sources(lovr PRIVATE
-    src/modules/data/audioStream.c
     src/modules/data/blob.c
     src/modules/data/modelData.c
     src/modules/data/modelData_gltf.c
@@ -358,7 +326,6 @@ if(LOVR_ENABLE_DATA)
     src/modules/data/soundData.c
     src/modules/data/textureData.c
     src/api/l_data.c
-    src/api/l_data_audioStream.c
     src/api/l_data_blob.c
     src/api/l_data_modelData.c
     src/api/l_data_rasterizer.c
@@ -546,7 +513,6 @@ if(WIN32)
   move_dll(${LOVR_GLFW})
   move_dll(${LOVR_LUA})
   move_dll(${LOVR_ODE})
-  move_dll(${LOVR_OPENAL})
   move_dll(${LOVR_OPENVR})
   move_dll(${LOVR_MSDF})
   foreach(target ${ALL_PLUGIN_TARGETS})
@@ -571,7 +537,6 @@ elseif(APPLE)
     move_lib(${LOVR_GLFW})
     move_lib(${LOVR_LUA})
     move_lib(${LOVR_ODE})
-    move_lib(${LOVR_OPENAL})
     move_lib(${LOVR_OPENVR})
     move_lib(${LOVR_MSDF})
     foreach(target ${ALL_PLUGIN_TARGETS})
@@ -598,7 +563,7 @@ elseif(ANDROID)
 
   # Dynamically linked targets output libraries in raw/lib/<ABI> for easy including in apk with aapt
   set_target_properties(
-    lovr ${LOVR_ODE} ${LOVR_OPENAL}
+    lovr ${LOVR_ODE}
     PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/raw/lib/${ANDROID_ABI}"
   )
 
diff --git a/deps/openal-soft b/deps/openal-soft
deleted file mode 160000
index 9c5307a4..00000000
--- a/deps/openal-soft
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 9c5307a48a58959a564be1999b119a87b7cdb8e0