Skip to content

Commit bc42371

Browse files
committed
reapply love-specific patches to OpenAL-Soft
1 parent 5e4f324 commit bc42371

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

libs/openal-soft/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1179,6 +1179,9 @@ if(ALSOFT_BACKEND_OBOE)
11791179
set(ALC_OBJS ${ALC_OBJS} alc/backends/oboe.cpp alc/backends/oboe.h)
11801180
set(BACKENDS "${BACKENDS} Oboe,")
11811181
set(EXTRA_LIBS ${OBOE_TARGET} ${EXTRA_LIBS})
1182+
if(MEGA)
1183+
set(ALC_OBJS ${ALC_OBJS} opensl_latency.cpp)
1184+
endif()
11821185
endif()
11831186
endif()
11841187
if(ALSOFT_REQUIRE_OBOE AND NOT HAVE_OBOE)
@@ -1555,6 +1558,8 @@ else()
15551558
endif()
15561559
endif()
15571560

1561+
set(OPENAL_LIB_NAME ${IMPL_TARGET} PARENT_SCOPE)
1562+
15581563
target_include_directories(${IMPL_TARGET}
15591564
PUBLIC
15601565
$<BUILD_INTERFACE:${OpenAL_SOURCE_DIR}/include>
@@ -1931,3 +1936,7 @@ if(EXTRA_INSTALLS)
19311936
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
19321937
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
19331938
endif()
1939+
1940+
if(MEGA)
1941+
install(TARGETS ${IMPL_TARGET} RUNTIME DESTINATION . LIBRARY DESTINATION .)
1942+
endif()

libs/openal-soft/libopenal.version

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,5 +188,8 @@ alSourcei64vSOFT;
188188
alSourceQueueBufferLayersSOFT;
189189
alUnmapBufferSOFT;
190190

191+
# love2d-mod
192+
Java_org_love2d_android_GameActivity_nativeSetDefaultStreamValues;
193+
191194
local: *;
192195
};

0 commit comments

Comments
 (0)