OpenAL On Windows

ReMinecraftPE · Jun 18, 2024 · 78b9dd2 · 78b9dd2
1 parent cdd0b29
commit 78b9dd2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/platforms/sound/openal/CMakeLists.txt b/platforms/sound/openal/CMakeLists.txt
@@ -22,9 +22,10 @@ elseif(EMSCRIPTEN)
     # Use Emscripten's OpenAL
     target_link_libraries(reminecraftpe-sound PUBLIC openal)
 else()
-    # Use System ZLib
-    find_library(OPENAL_LIBRARY NAMES openal REQUIRED)
+    # Use System OpenAL
+    find_package(OpenAL REQUIRED)
     target_link_libraries(reminecraftpe-sound PUBLIC "${OPENAL_LIBRARY}")
+    target_include_directories(reminecraftpe-sound PUBLIC "${OPENAL_INCLUDE_DIR}")
 endif()
 
 # Headers

diff --git a/platforms/sound/openal/CustomSoundSystem.hpp b/platforms/sound/openal/CustomSoundSystem.hpp
@@ -1,15 +1,15 @@
 #pragma once
 
-#ifdef _WIN32
-#include <al.h>
-#include <alc.h>
-#pragma comment( lib, "OpenAl32.lib" )
-#elif defined(__APPLE__)
+
+#ifdef __APPLE__
 #include <OpenAL/al.h>
 #include <OpenAL/alc.h>
 #else
-#include <AL/al.h>
-#include <AL/alc.h>
+#include "al.h"
+#include "alc.h"
+#ifdef _WIN32
+#pragma comment( lib, "OpenAL32.lib" )
+#endif
 #endif
 
 #include <string>