[CORE] Move WWAudio library files to Core

Core/Libraries/Source/WWVegas/CMakeLists.txt

@@ -7,36 +7,40 @@ target_compile_definitions(core_wwcommon INTERFACE
 )
 
 target_link_libraries(core_wwcommon INTERFACE
-    d3d8lib
     core_config
     core_utility
+    d3d8lib
     milesstub
     stlport
 )
 
 target_include_directories(core_wwcommon INTERFACE
     .
+    # WW3D2
+    WWAudio
     WWDebug
+    # WWDownload
     WWLib
     WWMath
     WWSaveLoad
 )
 
-# add_subdirectory(WWAudio)
+# add_subdirectory(WW3D2)
+add_subdirectory(WWAudio)
 add_subdirectory(WWDebug)
+add_subdirectory(WWDownload)
 add_subdirectory(WWLib)
 add_subdirectory(WWMath)
 add_subdirectory(WWSaveLoad)
 add_subdirectory(WWStub)
-# add_subdirectory(WW3D2)
-add_subdirectory(WWDownload)
 
 # Helpful interface to bundle the ww modules together.
 add_library(core_wwvegas INTERFACE)
 
 target_include_directories(core_wwvegas INTERFACE
     .
     #WW3D2
+    WWAudio
     WWDebug
     WWDownload
     WWLib
@@ -46,6 +50,7 @@ target_include_directories(core_wwvegas INTERFACE
 
 target_link_libraries(core_wwvegas INTERFACE
     # core_ww3d2
+    # core_wwaudio
     core_wwdebug
     # core_wwdownload
     core_wwlib

Core/Libraries/Source/WWVegas/WWAudio/CMakeLists.txt

@@ -0,0 +1,57 @@
+set(WWAUDIO_SRC
+    AABTreeSoundCullClass.h
+    AudibleSound.cpp
+    AudibleSound.h
+    AudioEvents.h
+    AudioSaveLoad.cpp
+    AudioSaveLoad.h
+    FilteredSound.cpp
+    FilteredSound.h
+    Listener.cpp
+    Listener.h
+    listenerhandle.cpp
+    listenerhandle.h
+    LogicalListener.cpp
+    LogicalListener.h
+    LogicalSound.cpp
+    LogicalSound.h
+    PriorityVector.h
+    sound2dhandle.cpp
+    sound2dhandle.h
+    Sound3D.cpp
+    Sound3D.h
+    sound3dhandle.cpp
+    sound3dhandle.h
+    SoundBuffer.cpp
+    SoundBuffer.h
+    SoundChunkIDs.h
+    SoundCullObj.h
+    soundhandle.cpp
+    soundhandle.h
+    SoundPseudo3D.cpp
+    SoundPseudo3D.h
+    SoundScene.cpp
+    SoundScene.h
+    SoundSceneObj.cpp
+    SoundSceneObj.h
+    soundstreamhandle.cpp
+    soundstreamhandle.h
+    Threads.cpp
+    Threads.h
+    Utils.cpp
+    Utils.h
+    WWAudio.cpp
+    WWAudio.h
+)
+
+# @todo Promote this to STATIC library when WW3D2 is a STATIC library as well
+
+add_library(corei_wwaudio INTERFACE)
+
+target_sources(corei_wwaudio INTERFACE ${WWAUDIO_SRC})
+
+target_include_directories(corei_wwaudio INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(corei_wwaudio INTERFACE
+    core_wwcommon
+)

Generals/Code/Libraries/Source/WWVegas/CMakeLists.txt

@@ -2,18 +2,17 @@
 add_library(g_wwcommon INTERFACE)
 
 target_link_libraries(g_wwcommon INTERFACE
-    d3d8lib
     core_config
     core_utility
     core_wwcommon
+    d3d8lib
     milesstub
     stlport
 )
 
 target_include_directories(g_wwcommon INTERFACE
     .
     WW3D2
-    WWAudio
 )
 
 add_subdirectory(WWAudio)
@@ -26,8 +25,6 @@ add_library(g_wwvegas INTERFACE)
 target_include_directories(g_wwvegas INTERFACE
     .
     WW3D2
-    WWAudio
-    WWDownload
 )
 
 target_link_libraries(g_wwvegas INTERFACE