Merge pull request #756 from edge-classic/music-shenanigans

Music shenanigans

docs/licenses/License Attribution.txt

@@ -22,13 +22,7 @@ FMMIDI library - Copyright (c) 2003-2006 yuno
 
 Freedoom (various assets) - Copyright (c) 2001-2019 Contributors to the Freedoom project
 
-libRAD (instruments.h) - Copyright (c) 2023 Contributors to the Freedoom project
-						  Copyright (c) ConSiGno ("DMXOPL" instrument bank which formed the basis for Freedoom's GENMIDI)
-
-libRAD (patches.cpp/radmidi.cpp) - Copyright (c) 2021-2023 Devin Acker
-
-Mod4Play library - 	Copyright (c) 2024 dashodanger
-					Copyright (c) 2022 Olav Sørensen
+IBXM - Copyright (c) 2019 Martin Cameron
 
 ZDoom FName implementation - Copyright (c) 2005-2007 Randy Heit
 
@@ -70,8 +64,6 @@ EDGE-Classic - Copyright (c) 1999-2024 The EDGE Team
 
 EPI library - Copyright (c) 2002-2024 The EDGE Team
 
-Fluidlite - Copyright (c) 2016 Robin Lobel
-
 SLADE (IMF->WAV conversion and sky drawing routines) - Copyright (c) 2008 - 2023 Simon Judd
 
 XMIDI library (MIDI conversion) - Copyright (c) 2015-2022 Vitaly Novichkov
@@ -119,6 +111,9 @@ PL_MPEG library - Copyright(c) 2019 Dominic Szablewski
 
 PNPOLY algorithm - Copyright (c) 1970-2003 Wm. Randolph Franklin
 
+TinySoundFont library - Copyright (C) 2017-2023 Bernhard Schelling 
+						(Based on SFZero, Copyright (C) 2012 Steve Folta, https://github.com/stevefolta/SFZero)
+
 ===========================================================================================
 Public Domain
 ===========================================================================================
@@ -127,7 +122,7 @@ dr_wav, dr_mp3, and dr_flac libraries - David Reid
 
 Fraction.hpp - Bisqwit
 
-libRAD (opal.cpp/radplay.cpp) - Reality Productions
+libRAD - Reality Productions
 
 prns.h - Marc B. Reynolds
 

libraries/CMakeLists.txt

@@ -1,22 +1,22 @@
 add_subdirectory(almostequals)
 add_subdirectory(crsid)
 add_subdirectory(dr_libs)
-add_subdirectory(fluidlite)
 add_subdirectory(fmmidi)
 if (NOT EDGE_GL_ES2)
   add_subdirectory(glad)
 else()
   add_subdirectory(gl4es)
 endif()
 add_subdirectory(hmm)
+add_subdirectory(ibxm)
 add_subdirectory(libemidi)
 add_subdirectory(libRAD)
 add_subdirectory(libvwad)
 add_subdirectory(lua)
-add_subdirectory(m4p)
 add_subdirectory(miniz)
 add_subdirectory(pl_mpeg)
 add_subdirectory(prns)
 add_subdirectory(stb)
 add_subdirectory(tracy)
+add_subdirectory(tsf)
 add_subdirectory(xxHash)