deps: update openal to 1.24.1

ZDoom · Nov 28, 2024 · 64e59f8 · 64e59f8
1 parent d5b240e
commit 64e59f8
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 4 deletions.
diff --git a/deps/openal/include/AL/al.h b/deps/openal/include/AL/al.h
@@ -5,9 +5,19 @@
 #ifdef __cplusplus
 extern "C" {
 
+#ifdef _MSVC_LANG
+#define AL_CPLUSPLUS _MSVC_LANG
+#else
+#define AL_CPLUSPLUS __cplusplus
+#endif
+
 #ifndef AL_DISABLE_NOEXCEPT
+#if AL_CPLUSPLUS >= 201103L
 #define AL_API_NOEXCEPT noexcept
-#if __cplusplus >= 201703L
+#else
+#define AL_API_NOEXCEPT
+#endif
+#if AL_CPLUSPLUS >= 201703L
 #define AL_API_NOEXCEPT17 noexcept
 #else
 #define AL_API_NOEXCEPT17
@@ -19,6 +29,8 @@ extern "C" {
 #define AL_API_NOEXCEPT17
 #endif
 
+#undef AL_CPLUSPLUS
+
 #else /* __cplusplus */
 
 #define AL_API_NOEXCEPT

diff --git a/deps/openal/include/AL/alc.h b/deps/openal/include/AL/alc.h
@@ -5,9 +5,19 @@
 #ifdef __cplusplus
 extern "C" {
 
+#ifdef _MSVC_LANG
+#define ALC_CPLUSPLUS _MSVC_LANG
+#else
+#define ALC_CPLUSPLUS __cplusplus
+#endif
+
 #ifndef AL_DISABLE_NOEXCEPT
+#if ALC_CPLUSPLUS >= 201103L
 #define ALC_API_NOEXCEPT noexcept
-#if __cplusplus >= 201703L
+#else
+#define ALC_API_NOEXCEPT
+#endif
+#if ALC_CPLUSPLUS >= 201703L
 #define ALC_API_NOEXCEPT17 noexcept
 #else
 #define ALC_API_NOEXCEPT17
@@ -19,6 +29,8 @@ extern "C" {
 #define ALC_API_NOEXCEPT17
 #endif
 
+#undef ALC_CPLUSPLUS
+
 #else /* __cplusplus */
 
 #define ALC_API_NOEXCEPT

diff --git a/deps/openal/lib/cmake/OpenAL/OpenALConfig.cmake b/deps/openal/lib/cmake/OpenAL/OpenALConfig.cmake
@@ -6,4 +6,4 @@ set(OPENAL_FOUND ON)
 set(OPENAL_INCLUDE_DIR $<TARGET_PROPERTY:OpenAL::OpenAL,INTERFACE_INCLUDE_DIRECTORIES>)
 set(OPENAL_LIBRARY $<LINK_ONLY:OpenAL::OpenAL>)
 set(OPENAL_DEFINITIONS $<TARGET_PROPERTY:OpenAL::OpenAL,INTERFACE_COMPILE_DEFINITIONS>)
-set(OPENAL_VERSION_STRING 1.24.0)
+set(OPENAL_VERSION_STRING 1.24.1)
diff --git a/deps/openal/lib/libopenal.a b/deps/openal/lib/libopenal.a
diff --git a/deps/openal/lib/pkgconfig/openal.pc b/deps/openal/lib/pkgconfig/openal.pc
@@ -6,7 +6,7 @@ includedir=${prefix}/include
 Name: OpenAL
 Description: OpenAL is a cross-platform 3D audio API
 Requires: 
-Version: 1.24.0
+Version: 1.24.1
 Libs: -L${libdir} -lopenal 
 Libs.private: -pthread -Wl,-framework,AudioToolbox -Wl,-framework,AudioUnit,-framework,ApplicationServices -Wl,-framework,CoreAudio -ldl -lm
 Cflags: -I${includedir} -I${includedir}/AL -DAL_LIBTYPE_STATIC