Browse Source

reapply love-specific patches to OpenAL-Soft

Sasha Szpakowski 7 months ago
parent
commit
bc423714ec
2 changed files with 12 additions and 0 deletions
  1. 9 0
      libs/openal-soft/CMakeLists.txt
  2. 3 0
      libs/openal-soft/libopenal.version

+ 9 - 0
libs/openal-soft/CMakeLists.txt

@@ -1179,6 +1179,9 @@ if(ALSOFT_BACKEND_OBOE)
         set(ALC_OBJS  ${ALC_OBJS} alc/backends/oboe.cpp alc/backends/oboe.h)
         set(BACKENDS  "${BACKENDS} Oboe,")
         set(EXTRA_LIBS ${OBOE_TARGET} ${EXTRA_LIBS})
+        if(MEGA)
+            set(ALC_OBJS  ${ALC_OBJS} opensl_latency.cpp)
+        endif()
     endif()
 endif()
 if(ALSOFT_REQUIRE_OBOE AND NOT HAVE_OBOE)
@@ -1555,6 +1558,8 @@ else()
     endif()
 endif()
 
+set(OPENAL_LIB_NAME ${IMPL_TARGET} PARENT_SCOPE)
+
 target_include_directories(${IMPL_TARGET}
   PUBLIC
     $<BUILD_INTERFACE:${OpenAL_SOURCE_DIR}/include>
@@ -1931,3 +1936,7 @@ if(EXTRA_INSTALLS)
         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()
+
+if(MEGA)
+    install(TARGETS ${IMPL_TARGET} RUNTIME DESTINATION . LIBRARY DESTINATION .)
+endif()

+ 3 - 0
libs/openal-soft/libopenal.version

@@ -188,5 +188,8 @@ alSourcei64vSOFT;
 alSourceQueueBufferLayersSOFT;
 alUnmapBufferSOFT;
 
+# love2d-mod
+Java_org_love2d_android_GameActivity_nativeSetDefaultStreamValues;
+
 local: *;
 };