[CMAKE] Add OpenAL build option

Author: feliwir

GeneralsMD/Code/GameEngineDevice/CMakeLists.txt

@@ -247,4 +247,22 @@ if(RTS_BUILD_OPTION_FFMPEG)
         target_link_libraries(z_gameenginedevice PRIVATE ${FFMPEG_LIBRARIES})
         target_compile_definitions(z_gameenginedevice PUBLIC RTS_HAS_FFMPEG)
     endif()
+endif()
+
+if(RTS_BUILD_OPTION_OPENAL)
+    find_package(OpenAL CONFIG REQUIRED)
+
+    if(OpenAL_FOUND)
+        #target_sources(z_gameenginedevice PRIVATE
+        #    Include/OpenALDevice/OpenALAudioManager.h
+        #    Include/OpenALDevice/OpenALAudioStream.h
+        #    Source/OpenALDevice/OpenALAudioCache.h
+        #    Source/OpenALDevice/OpenALAudioCache.cpp
+        #    Source/OpenALDevice/OpenALAudioManager.cpp
+        #    Source/OpenALDevice/OpenALAudioStream.cpp
+        #)
+
+        target_link_libraries(z_gameenginedevice PRIVATE OpenAL::OpenAL)
+        target_compile_definitions(z_gameenginedevice PUBLIC RTS_HAS_OPENAL)
+    endif()
 endif()

GeneralsMD/Code/GameEngineDevice/Source/MilesAudioDevice/MilesAudioFileCache.h

@@ -19,6 +19,8 @@
 // FILE: MilesAudioFileCache.h //////////////////////////////////////////////////////////////////////////
 // MilesAudioManager implementation
 // Author: John K. McDonald, July 2002
+#pragma once
+
 #include "MilesAudioDevice/MilesAudioManager.h"
 
 struct PlayingAudio
@@ -37,11 +39,11 @@ struct PlayingAudio
 	Bool m_requestStop;
 	Bool m_cleanupAudioEventRTS;
 	Int m_framesFaded;
-	
-	PlayingAudio() : 
-		m_type(PAT_INVALID), 
-		m_audioEventRTS(NULL), 
-		m_requestStop(false), 
+
+	PlayingAudio() :
+		m_type(PAT_INVALID),
+		m_audioEventRTS(NULL),
+		m_requestStop(false),
 		m_cleanupAudioEventRTS(true),
 		m_sample(NULL), 
 		m_framesFaded(0)
@@ -56,7 +58,7 @@ struct OpenAudioFile
 	UnsignedInt m_fileSize;
 
 	Bool m_compressed;	// if the file was compressed, then we need to free it with a miles function.
-	
+
 	// Note: OpenAudioFile does not own this m_eventInfo, and should not delete it.
 	const AudioEventInfo *m_eventInfo;	// Not mutable, unlike the one on AudioEventRTS.
 };
@@ -68,7 +70,7 @@ class MilesAudioFileCache
 {
 	public:
 		MilesAudioFileCache();
-		
+
 		// Protected by mutex
 		virtual ~MilesAudioFileCache();
 		void *openFile( AudioEventRTS *eventToOpenFrom );
@@ -87,7 +89,7 @@ class MilesAudioFileCache
 
 		// This function will return TRUE if it was able to free enough space, and FALSE otherwise.
 		Bool freeEnoughSpaceForSample(const OpenAudioFile& sampleThatNeedsSpace);
-		
+
 		OpenFilesHash m_openFiles;
 		UnsignedInt m_currentlyUsedSize;
 		UnsignedInt m_maxSize;

cmake/config-build.cmake

@@ -8,6 +8,7 @@ option(RTS_BUILD_OPTION_PROFILE "Build code with the \"Profile\" configuration."
 option(RTS_BUILD_OPTION_DEBUG "Build code with the \"Debug\" configuration." OFF)
 option(RTS_BUILD_OPTION_ASAN "Build code with Address Sanitizer." OFF)
 option(RTS_BUILD_OPTION_FFMPEG "Enable FFmpeg support" OFF)
+option(RTS_BUILD_OPTION_OPENAL "Enable OpenAL support" OFF)
 
 if(NOT RTS_BUILD_ZEROHOUR AND NOT RTS_BUILD_GENERALS)
     set(RTS_BUILD_ZEROHOUR TRUE)
@@ -23,6 +24,7 @@ add_feature_info(ProfileBuild RTS_BUILD_OPTION_PROFILE "Building as a \"Profile\
 add_feature_info(DebugBuild RTS_BUILD_OPTION_DEBUG "Building as a \"Debug\" build")
 add_feature_info(AddressSanitizer RTS_BUILD_OPTION_ASAN "Building with address sanitizer")
 add_feature_info(FFmpegSupport RTS_BUILD_OPTION_FFMPEG "Building with FFmpeg support")
+add_feature_info(OpenALSupport RTS_BUILD_OPTION_OPENAL "Building with OpenAL support")
 
 if(RTS_BUILD_ZEROHOUR)
     option(RTS_BUILD_ZEROHOUR_TOOLS "Build tools for Zero Hour" ON)

vcpkg.json

@@ -3,6 +3,7 @@
     "builtin-baseline": "b02e341c927f16d991edbd915d8ea43eac52096c",
     "dependencies": [
       "zlib",
-      "ffmpeg"
+      "ffmpeg",
+      "openal-soft"
     ]
   }