Skip to content

Commit

Permalink
Downgrade OpenAL to 1.19.1
Browse files Browse the repository at this point in the history 
This still solves kcat/openal-soft#227 which seems to be fixed in 1.19.1
  • Loading branch information
@dimensionscape
dimensionscape committed Oct 24, 2024
1 parent f60d8a7 commit 583e742
Show file tree
Hide file tree
Showing 2 changed files with 90 additions and 93 deletions.
2 changes: 1 addition & 1 deletion project/lib/openal
Submodule openal updated 301 files
181 changes: 89 additions & 92 deletions project/lib/openal-files.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,90 +2,87 @@

<files id="native-toolkit-openal">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/openal/alc/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/alc/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/openal/build/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/common/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/openal/include/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/include/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/Alc/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/openal/build/"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/common/"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/openal/include/"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/include/"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/Include/"/>
<compilerflag value="-DAL_LIBTYPE_STATIC" if="native_toolkit_openal_static" />

<compilerflag value="-DAL_ALEXT_PROTOTYPES" />
<compilerflag value="-DAL_ALEXT_PROTOTYPES"/>
<compilerflag value="-D_LARGEFILE_SOURCE" />
<compilerflag value="-D_LARGE_FILES" />
<compilerflag value="-DNOMINMAX" />

<file name="${NATIVE_TOOLKIT_PATH}/openal/al/auxeffectslot.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/al/buffer.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/al/effect.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/al/error.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/al/event.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/al/extension.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/al/filter.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/al/listener.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/al/source.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/al/state.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/alc.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/alconfig.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/alu.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/ambdec.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/base.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/loopback.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/null.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/wave.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/bformatdec.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/bs2b.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/converter.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/autowah.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/chorus.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/compressor.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/dedicated.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/distortion.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/echo.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/equalizer.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/fshifter.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/modulator.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/null.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/pshifter.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/reverb.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/effects/vmorpher.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/filters/biquad.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/filters/nfc.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/filters/splitter.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/helpers.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/hrtf.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mastering.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_c.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_neon.cpp" if="rpi || HXCPP_ARM64" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_sse.cpp" unless="rpi || android || HXCPP_ARM64" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_sse2.cpp" unless="rpi || android || HXCPP_ARM64" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/mixer/mixer_sse3.cpp" unless="rpi || android || HXCPP_ARM64" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/panning.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/ringbuffer.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/uhjfilter.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/voice.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/alcomplex.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/alexcpt.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/alfstream.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/almalloc.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/alstring.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/dynload.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/strutils.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/threads.cpp" />

<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/base.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/loopback.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/null.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/wave.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/autowah.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/chorus.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/compressor.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/dedicated.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/distortion.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/echo.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/equalizer.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/fshifter.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/modulator.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/null.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/pshifter.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/effects/reverb.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/filters/filter.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/filters/nfc.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/filters/splitter.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/mixer/mixer_c.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/mixer/mixer_sse.c" unless="rpi || android" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/mixer/mixer_sse2.c" unless="rpi || android" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/mixer/mixer_sse3.c" unless="rpi || android" />
<!-- <file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/mixer/mixer_sse41.c" unless="rpi || android" /> -->
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/mixer/mixer_neon.c" if="rpi" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/ALc.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/alconfig.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/ALu.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/ambdec.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/bformatdec.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/bs2b.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/converter.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/helpers.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/hrtf.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/mastering.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/mixvoice.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/panning.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/ringbuffer.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/uhjfilter.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/alcomplex.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/almalloc.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/atomic.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/rwlock.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/threads.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/common/uintmap.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/alAuxEffectSlot.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/alBuffer.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/alEffect.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/alError.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/alExtension.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/alFilter.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/alListener.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/alSource.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/alState.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/event.c"/>
<file name="${NATIVE_TOOLKIT_PATH}/openal/OpenAL32/sample_cvt.c"/>

<section if="NATIVE_TOOLKIT_HAVE_SDL">

<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/custom/sdl/include/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/overrides/sdl/include/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows" />
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/default/" unless="windows || mac || linux || rpi"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/linux/" if="linux" unless="rpi"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/windows/" if="windows"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/mac/" if="mac"/>
<compilerflag value="-I${NATIVE_TOOLKIT_PATH}/sdl/include/configs/rpi/" if="rpi"/>

<compilerflag value="-DHAVE_SDL2" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/sdl2.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/sdl2.c" />

</section>

Expand All @@ -98,35 +95,34 @@
<compilerflag value="-msse2" unless="rpi" />
<compilerflag value="-msse3" unless="rpi" />
<compilerflag value="-mssse3" unless="rpi" />
<compilerflag value="-mfpu=neon" if="rpi" unless="HXCPP_ARM64" />
<compilerflag value="-mfpu=neon" if="rpi" />
<compilerflag value="-fcommon" />

<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/alsa.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/oss.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/pulseaudio.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/pulseaudio.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/alsa.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/oss.c" />

</section>

<section if="mac">

<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/coreaudio.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/coreaudio.c" />

<compilerflag value="-mmmx" unless="HXCPP_ARM64" />
<compilerflag value="-msse" unless="HXCPP_ARM64" />
<compilerflag value="-msse2" unless="HXCPP_ARM64" />
<compilerflag value="-msse3" unless="HXCPP_ARM64" />
<compilerflag value="-mssse3" unless="HXCPP_ARM64" />
<compilerflag value="-mmmx" />
<compilerflag value="-msse" />
<compilerflag value="-msse2" />
<compilerflag value="-msse3" />
<compilerflag value="-mssse3" />

</section>

<section if="windows">

<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/dsound.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/wasapi.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/winmm.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/uiddefs.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/winmm.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/dsound.c" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/wasapi.c" />

<compilerflag value="-DWIN32" />
<compilerflag value="-DWIN32"/>
<compilerflag value="-D_WINDOWS" />
<compilerflag value="-D_WIN32" />
<compilerflag value="-D_WIN32_WINNT=0x0502" />
Expand All @@ -149,18 +145,19 @@
<compilerflag value="-fPIC" />
<compilerflag value="-fvisibility=hidden" />
<compilerflag value="-pthread" />
<compilerflag value="--std=c99" />

</section>

<section if="android">

<error value="NDK version 20 or higher is required." unless="NDKV20+" />
<compilerflag value="-Wno-psabi" unless="HXCPP_CLANG" />
<compilerflag value="-fsigned-char" />

<file name="${NATIVE_TOOLKIT_PATH}/openal/alc/backends/opensl.cpp" />
<file name="${NATIVE_TOOLKIT_PATH}/openal/Alc/backends/opensl.c" />

</section>

</files>

</xml>
</xml>

0 comments on commit 583e742

Please sign in to comment.