Add CMake option to build without AudioMan

Author: benstone

CMakeLists.txt

@@ -54,8 +54,13 @@ endif()
 set(3DMM_BRENDER_LIBRARY "${3DMM_BRENDER_LIBRARY_DEFAULT}" CACHE STRING "Argonaut BRender library to use for rendering 3D images")
 set_property(CACHE 3DMM_BRENDER_LIBRARY PROPERTY STRINGS "Original" "Source")
 
-set(3DMM_AUDIOMAN_LIBRARY "Decompilation" CACHE STRING "AudioMan library to use for mixing wave sounds")
-set_property(CACHE 3DMM_AUDIOMAN_LIBRARY PROPERTY STRINGS "Original" "Decompilation")
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+    # AudioMan is only supported on Windows
+    set(3DMM_AUDIOMAN_LIBRARY "Decompilation" CACHE STRING "AudioMan library to use for mixing wave sounds")
+    set_property(CACHE 3DMM_AUDIOMAN_LIBRARY PROPERTY STRINGS "Original" "Decompilation" "None")
+else()
+    set(3DMM_AUDIOMAN_LIBRARY "None")
+endif()
 
 # Default to Win32 on Windows, and SDL on other platforms.
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
@@ -168,7 +173,7 @@ endif()
 if ("${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "Original")
 
     # Use original static library
-    find_package(AudioMan)
+    find_package(AudioMan REQUIRED)
 
 elseif("${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "Decompilation")
 
@@ -184,10 +189,16 @@ elseif("${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "Decompilation")
     FetchContent_MakeAvailable(AudioManDecomp)
     add_library(3DMMForever::AudioMan ALIAS AudioMan)
 
+elseif("${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "None")
+    # No AudioMan
 else()
     message(FATAL_ERROR "Invalid AudioMan library selected: ${3DMM_AUDIOMAN_LIBRARY}")
 endif()
 
+if (NOT "${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "None")
+    add_compile_definitions(HAS_AUDIOMAN)
+endif()
+
 add_custom_target(tests)
 
 add_subdirectory(kauai)

inc/srec.h

@@ -14,7 +14,9 @@
 #ifndef SREC_H
 #define SREC_H
 
+#ifdef HAS_AUDIOMAN
 #include "audioman.h"
+#endif // HAS_AUDIOMAN
 
 /****************************************
     RIFF Header helper class
@@ -33,6 +35,8 @@
 #define FACT_TAG 'tcaf' // fact
 #endif
 
+#ifdef KAUAI_WIN32
+
 #pragma pack(push, _SOCPACK_)
 #pragma pack(1)
 
@@ -79,6 +83,8 @@ class RIFF
 };
 #pragma pack(pop, _SOCPACK_)
 
+#endif // KAUAI_WIN32
+
 /****************************************
     The sound recording class
 ****************************************/
@@ -105,9 +111,11 @@ class SREC : public SREC_PAR
     HWAVEIN _hwavein; // handle to wavein device
     WAVEHDR _wavehdr; // wave hdr for buffer
 
+#if defined(HAS_AUDIOMAN)
     LPMIXER _pmixer;     // pointer to Audioman Mixer
     LPCHANNEL _pchannel; // pointer to Audioman Channel
     LPSOUND _psnd;       // psnd for current sound
+#endif                   // HAS_AUDIOMAN
     RIFF *_priff;        // pointer to riff in memory
 
     bool _FOpenRecord();

kauai/CMakeLists.txt

@@ -247,33 +247,47 @@ target_link_libraries(
 )
 
 if (3DMM_GUI STREQUAL "Win32")
-    # Win32: Use AudioMan for wave sounds and winmm MIDI player for music
+    # Win32: Use AudioMan for wave sounds
+
+    if (NOT "${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "None")
+        target_sources(
+            KauaiSound
+            PRIVATE
+            "${PROJECT_SOURCE_DIR}/kauai/src/sndam.cpp"
+        )
+        target_link_libraries(
+            KauaiSound
+            PUBLIC
+            3DMMForever::AudioMan
+            msacm32
+        )
+        if ("${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "Original")
+            # The static library requires a stub for some old MSVC floating-point division helper functions
+            add_library(
+                FDivStub
+                "${PROJECT_SOURCE_DIR}/kauai/src/stub.cpp"
+            )
+            target_link_libraries(
+                KauaiSound
+                PRIVATE
+                FDivStub
+            )
+        endif()
+    endif()
+
+    # Use Win32 MIDI player
     target_sources(
         KauaiSound
         PRIVATE
-        "${PROJECT_SOURCE_DIR}/kauai/src/sndam.cpp"
         "${PROJECT_SOURCE_DIR}/kauai/src/mididev.cpp"
         "${PROJECT_SOURCE_DIR}/kauai/src/mididev2.cpp"
     )
     target_link_libraries(
         KauaiSound
         PUBLIC
-        3DMMForever::AudioMan
-        msacm32
         winmm
     )
-    if ("${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "Original")
-        # The static library requires a stub for some old MSVC floating-point division helper functions
-        add_library(
-            FDivStub
-            "${PROJECT_SOURCE_DIR}/kauai/src/stub.cpp"
-        )
-        target_link_libraries(
-            KauaiSound
-            PRIVATE
-            FDivStub
-        )
-    endif()
+
 else()
     message(WARNING "Sound playback disabled")
 endif()

kauai/src/appb.cpp

@@ -626,11 +626,14 @@ bool APPB::_FInitSound(int32_t wav)
         return fTrue;
 
 #if defined(KAUAI_WIN32)
+
+#if defined(HAS_AUDIOMAN)
     if (pvNil != (psndv = SDAM::PsdamNew(wav)))
     {
         vpsndm->FAddDevice(kctgWave, psndv);
         ReleasePpo(&psndv);
     }
+#endif // HAS_AUDIOMAN
 
     // create the midi playback device - use the stream one
     if (pvNil != (psndv = MDPS::PmdpsNew()))

src/CMakeLists.txt

@@ -39,7 +39,7 @@ target_sources(engine
     "${PROJECT_SOURCE_DIR}/src/engine/tdt.cpp"
     "${PROJECT_SOURCE_DIR}/src/engine/tmpl.cpp"
 )
-if (3DMM_GUI STREQUAL "Win32")
+if (3DMM_GUI STREQUAL "Win32" AND NOT 3DMM_AUDIOMAN_LIBRARY STREQUAL "None")
     target_sources(engine
         PRIVATE
         "${PROJECT_SOURCE_DIR}/src/engine/srecwin.cpp"
@@ -60,8 +60,13 @@ target_link_libraries(engine
     KauaiDoc
     KauaiRichText
     bren
-    3DMMForever::AudioMan  # required for sound recorder
 )
+if (NOT "${3DMM_AUDIOMAN_LIBRARY}" STREQUAL "None")
+    target_link_libraries(engine
+        PUBLIC
+        3DMMForever::AudioMan
+    )
+endif()
 
 # On non-windows WIN32 is a no-op
 add_executable(studio WIN32)
@@ -123,6 +128,7 @@ target_link_libraries(studio
 
     $<$<PLATFORM_ID:Windows>:mpr> # Required for WNetGetUser()
     $<$<PLATFORM_ID:Windows>:vfw32> # Required for ICInfo in _wHaveICMCodec
+    $<$<PLATFORM_ID:Windows>:msacm32> # Required for acmFormatTagDetailsA in _wHaveACMCodec
 )
 
 set_property(TARGET studio PROPERTY OUTPUT_NAME 3dmovie)

src/engine/msnd.cpp

@@ -23,7 +23,10 @@
 
 ***************************************************************************/
 #include "soc.h"
+
+#ifdef HAS_AUDIOMAN
 #include "audioman.h"
+#endif // HAS_AUDIOMAN
 
 ASSERTNAME
 
@@ -303,6 +306,8 @@ bool MSND::FCopyWave(PFIL pfilSrc, PCFL pcflDest, int32_t sty, CNO *pcno, PSTN p
     Assert(sty != styMidi, "Illegal sty argument");
     AssertNilOrPo(pstn, 0);
 
+#if defined(KAUAI_WIN32) && defined(HAS_AUDIOMAN)
+
     FNI fniSrc;
     STN stnName; // sound name
     STN stn;     // src file path name
@@ -566,6 +571,12 @@ bool MSND::FCopyWave(PFIL pfilSrc, PCFL pcflDest, int32_t sty, CNO *pcno, PSTN p
     if (tYes == fniNew.TExists())
         fniNew.FDelete();
     return fFalse;
+
+#else
+    // TODO: implement sound import without AudioMan
+    RawRtn();
+    return fFalse;
+#endif // KAUAI_WIN32 && HAS_AUDIOMAN
 }
 
 /***************************************************************************