15th attempt to fix GH Actions building

Author: Wilyicaro

platforms/CMakeLists.txt

@@ -7,4 +7,7 @@ if(MCPE_WIN32)
 endif()
 set(REMCPE_PLATFORM "${DEFAULT_PLATFORM}" CACHE STRING "ReMCPE Platform (Check <root>/platforms)")
 message(STATUS "Selected Platform: ${REMCPE_PLATFORM}")
-add_subdirectory("${REMCPE_PLATFORM}")
+add_subdirectory("${REMCPE_PLATFORM}")
+
+# Load Sound
+add_subdirectory(sound)

platforms/android/CMakeLists.txt

@@ -9,7 +9,6 @@ add_library(reminecraftpe SHARED
     android_native_app_glue.c
     AppPlatform_android.cpp
     main.cpp
-    SoundSystemSL.cpp
 )
 
 # Core
@@ -22,4 +21,4 @@ target_link_libraries(reminecraftpe-core PUBLIC EGL GLESv1_CM)
 target_link_libraries(reminecraftpe stb_image)
 
 # Extra Dependencies
-target_link_libraries(reminecraftpe android OpenSLES)
+target_link_libraries(reminecraftpe android)

platforms/openal/CMakeLists.txt

@@ -72,8 +72,4 @@ endif()
 if(EMSCRIPTEN)
     # Export Resize Function
     target_link_options(reminecraftpe PRIVATE -sEXPORTED_FUNCTIONS=_main,_resize_from_js -sEXPORTED_RUNTIME_METHODS=ccall)
-endif()
-
-# OpenAL
-add_subdirectory(../openal openal)
-target_link_libraries(reminecraftpe reminecraftpe-openal)
+endif()

platforms/sdl/CMakeLists.txt

@@ -0,0 +1,11 @@
+project(reminecraftpe-sound)
+
+# Select & Build
+set(DEFAULT_SOUND_PLATFORM "openal")
+if(MCPE_WIN32)
+    set(DEFAULT_SOUND_PLATFORM "directsound")
+endif()
+set(REMCPE_SOUND_PLATFORM "${DEFAULT_SOUND_PLATFORM}" CACHE STRING "ReMCPE Sound Platform (Check <root>/platforms/sound)")
+message(STATUS "Selected Sound Platform: ${REMCPE_SOUND_PLATFORM}")
+add_subdirectory("${REMCPE_SOUND_PLATFORM}")
+target_link_libraries(reminecraftpe reminecraftpe-sound)

platforms/sound/CMakeLists.txt

@@ -0,0 +1,17 @@
+cmake_minimum_required(VERSION 3.16.0)
+project(reminecraftpe-directsound)
+
+# Build
+add_library(reminecraftpe-sound STATIC
+    SoundSystemDS.cpp
+)
+
+# Libraries
+target_link_libraries(reminecraftpe-sound
+    reminecraftpe-core
+    dsound
+    dxguid
+)
+
+# Headers
+target_include_directories(reminecraftpe-sound PUBLIC .)