Work in progress

CMakeLists.txt

@@ -12,6 +12,7 @@ find_package(libavif CONFIG REQUIRED)
 find_package(CURL CONFIG REQUIRED)
 find_package(fmt CONFIG REQUIRED)
 find_package(Ogg CONFIG REQUIRED)
+find_package(OpenAL CONFIG REQUIRED)
 find_package(PhysFS CONFIG REQUIRED)
 find_package(SDL2 CONFIG REQUIRED)
 find_package(SPNG CONFIG REQUIRED)
@@ -65,6 +66,7 @@ target_link_libraries(${PROJECT_NAME} avif)
 target_link_libraries(${PROJECT_NAME} CURL::libcurl)
 target_link_libraries(${PROJECT_NAME} fmt::fmt)
 target_link_libraries(${PROJECT_NAME} Ogg::ogg)
+target_link_libraries(${PROJECT_NAME} OpenAL::OpenAL)
 target_link_libraries(${PROJECT_NAME} physfs-static)
 target_link_libraries(${PROJECT_NAME} SDL2::SDL2-static)
 target_link_libraries(${PROJECT_NAME} SDL2::SDL2main)

conanfile.txt

@@ -4,6 +4,7 @@ libavif/1.0.1
 libcurl/8.10.1
 libspng/0.7.4
 ogg/1.3.5
+openal-soft/1.23.1
 physfs/3.2.0
 sdl/2.30.7
 sol2/3.3.1

src/application.cpp

@@ -16,7 +16,6 @@ application::application(int argc, char **argv) {
   UNUSED(argc);
   UNUSED(argv);
 
-  curl_global_init(CURL_GLOBAL_ALL);
   SDL_Init(SDL_INIT_AUDIO | SDL_INIT_GAMECONTROLLER | SDL_INIT_VIDEO);
   SDL_EventState(SDL_CONTROLLERDEVICEADDED, SDL_ENABLE);
   SDL_EventState(SDL_CONTROLLERDEVICEREMOVED, SDL_ENABLE);
@@ -46,5 +45,4 @@ int application::run() {
 application::~application() {
   PHYSFS_deinit();
   SDL_Quit();
-  curl_global_cleanup();
 }

src/common.hpp

@@ -7,6 +7,9 @@
 #define NOMINMAX
 
 extern "C" {
+#include <AL/al.h>
+#include <AL/alc.h>
+#include <AL/alext.h>
 #include <SDL2/SDL.h>
 #include <avif/avif.h>
 #include <curl/curl.h>

src/deleters.hpp

@@ -38,10 +38,4 @@ struct SDL_Deleter {
       SDL_GameControllerClose(ptr);
     }
   }
-
-  inline void operator()(spng_ctx *ptr) {
-    if (ptr) {
-      spng_ctx_free(ptr);
-    }
-  }
 };