Consolidate optional features into a single (opt-out) define; miniaud…

…io fixes

CMakeLists.txt

@@ -27,20 +27,7 @@ if (EDGE_SOKOL_GL OR EDGE_SOKOL_GLES3 OR EDGE_SOKOL_D3D11)
 endif()
 
 # Optional Features
-option(EDGE_COAL_SUPPORT "Enable support for COAL scripting" ON)
-option(EDGE_DEHACKED_SUPPORT "Enable support for Dehacked patch conversion" ON)
-option(EDGE_DOOM_SFX_SUPPORT "Enable support for Doom/PC Speaker sound format" ON)
-option(EDGE_FLAC_SUPPORT "Enable support for FLAC music format" ON)
-option(EDGE_IMF_SUPPORT "Enable support for IMF music format" ON)
-option(EDGE_MP3_SUPPORT "Enable support for MP3 music format" ON)
-option(EDGE_MUS_SUPPORT "Enable support for MUS MIDI format" ON)
-option(EDGE_OGG_SUPPORT "Enable support for OGG music format" ON)
-option(EDGE_OPL_SUPPORT "Enable support for MIDI playback via OPL emulation" ON)
-option(EDGE_SID_SUPPORT "Enable support for C64 SID music" ON)
-option(EDGE_TRACKER_SUPPORT "Enable support for Tracker music (MOD/XM/S3M/IT)" ON)
-option(EDGE_XMI_SUPPORT "Enable support for XMI MIDI format" ON)
-option(EDGE_VWAD_SUPPORT "Enable support for k8vavoom VWAD archives" ON)
-option(EDGE_WAV_SUPPORT "Enable support for WAV sound format" ON)
+option(EDGE_CLASSIC "Enable default features for EDGE-Classic" ON)
 
 # Development 
 option(EDGE_SANITIZE "Enable code sanitizing" OFF)
@@ -173,60 +160,8 @@ else()
   find_package(OpenGL REQUIRED)
 endif()
 
-if (EDGE_COAL_SUPPORT)
-  add_definitions(-DEDGE_COAL_SUPPORT)
-endif()
-
-if (EDGE_DEHACKED_SUPPORT)
-  add_definitions(-DEDGE_DEHACKED_SUPPORT)
-endif()
-
-if (EDGE_DOOM_SFX_SUPPORT)
-  add_definitions(-DEDGE_DOOM_SFX_SUPPORT)
-endif()
-
-if (EDGE_FLAC_SUPPORT)
-  add_definitions(-DEDGE_FLAC_SUPPORT)
-endif()
-
-if (EDGE_IMF_SUPPORT)
-  add_definitions(-DEDGE_IMF_SUPPORT)
-endif()
-
-if (EDGE_MP3_SUPPORT)
-  add_definitions(-DEDGE_MP3_SUPPORT)
-endif()
-
-if (EDGE_MUS_SUPPORT)
-  add_definitions(-DEDGE_MUS_SUPPORT)
-endif()
-
-if (EDGE_OGG_SUPPORT)
-  add_definitions(-DEDGE_OGG_SUPPORT)
-endif()
-
-if (EDGE_OPL_SUPPORT)
-  add_definitions(-DEDGE_OPL_SUPPORT)
-endif()
-
-if (EDGE_SID_SUPPORT)
-  add_definitions(-DEDGE_SID_SUPPORT)
-endif()
-
-if (EDGE_TRACKER_SUPPORT)
-  add_definitions(-DEDGE_TRACKER_SUPPORT)
-endif()
-
-if (EDGE_VWAD_SUPPORT)
-  add_definitions(-DEDGE_VWAD_SUPPORT)
-endif()
-
-if (EDGE_XMI_SUPPORT)
-  add_definitions(-DEDGE_XMI_SUPPORT)
-endif()
-
-if (EDGE_WAV_SUPPORT)
-  add_definitions(-DEDGE_WAV_SUPPORT)
+if (EDGE_CLASSIC)
+  add_definitions(-DEDGE_CLASSIC)
 endif()
 
 if (EDGE_PROFILING)

README.md

@@ -61,9 +61,9 @@ An optional texture pack to enhance the experience can be found [here.](https://
 
 - UDMF map support
 - DEHEXTRA compatibility
-- A soundfont-capable MIDI player (SF2 support)
-- OPL emulation with external OP2/AIL/TMB instrument support
-- Support for MP3 music and sound effects
+- A soundfont-capable MIDI player (SF2/SF3 support)
+- OPL emulation with external OP2/AIL/TMB/WOPL instrument support
+- Many more music and sound formats (MP3, OGG, FLAC, IT/S3M/XM/MOD Tracker music)
 - UMAPINFO compatibility
 - Migration from SDL1 to SDL2 (longevity and potential new features)
 - Improved support for gamepads
@@ -76,7 +76,6 @@ An optional texture pack to enhance the experience can be found [here.](https://
 - Inventory system
 - Autoload folder
 - New Liquid animation (SMMU, SMMU+Swirl and Parallax)
-- Many more music formats (OGG, FLAC, IT/S3M/XM/MOD/RAD Tracker music and even C64 SID!)
 - Optional Dynamic Sound Reverb
 - Optional Pistol Start feature
 - Support for image/spritesheet and TrueType fonts
@@ -86,13 +85,12 @@ Bugfixes and detailed changes can be found in CHANGELOG.txt
 
 # Currently Supported Platforms
 
-- Windows 32/64-bit (x86 architecture), XP or later
-  - Windows XP builds are created with w64devkit; instructions are in COMPILING.md
+- Windows 7 or later
 - [Web Browsers](https://edge-classic.github.io/play.html) (Desktop browsers are supported, mobile browsers require future touch and gamepad input work)
-- Linux 32/64-bit (x86 and ARM architecture - ARM tested with Raspberry Pi OS on a Pi 4B)
-- BSD 32/64-bit (x86 and ARM64 architecture - tested with FreeBSD 13.1; ARM64 tested on a Pi 4B but not recommended unless proper video acceleration is available
+- Linux (x86 and ARM architecture - ARM tested with Raspberry Pi OS on a Pi 4B)
+- BSD (x86 and ARM64 architecture - tested with FreeBSD 13.1; ARM64 tested on a Pi 4B but not recommended unless proper video acceleration is available
                  as playable framerates are too difficult to achieve otherwise)
-- Mac 64-bit (x86 and M1 architecture)
+- Mac (x86 and M1 architecture)
 
 # Currently Supported IWADs
 

libraries/CMakeLists.txt

@@ -1,7 +1,4 @@
 add_subdirectory(almostequals)
-if (EDGE_SID_SUPPORT)
-  add_subdirectory(crsid)
-endif()
 add_subdirectory(miniaudio)
 add_subdirectory(fluidlite)
 if (EDGE_SOKOL)
@@ -11,17 +8,8 @@ else()
   add_subdirectory(glad)
 endif()
 add_subdirectory(hmm)
-if (EDGE_VWAD_SUPPORT)
-  add_subdirectory(libvwad)
-endif()
 add_subdirectory(lua)
-if (EDGE_TRACKER_SUPPORT)
-  add_subdirectory(m4p)
-endif()
 add_subdirectory(miniz)
-if (EDGE_IMF_SUPPORT OR EDGE_OPL_SUPPORT)
-  add_subdirectory(opalmidi)
-endif()
 add_subdirectory(pl_mpeg)
 add_subdirectory(prns)
 add_subdirectory(stb)
@@ -32,4 +20,9 @@ if (NOT EMSCRIPTEN)
   endif()
 endif()
 add_subdirectory(tracy)
-add_subdirectory(xxHash)
+add_subdirectory(xxHash)
+
+if (EDGE_CLASSIC)
+  add_subdirectory(m4p)
+  add_subdirectory(opalmidi)
+endif()