Merge pull request #765 from edge-classic/restore-m4p

Back to Mod4Play
edge-classic · Dec 23, 2024 · 31ed77f · 31ed77f
2 parents 23f84ee + d8d6c17
commit 31ed77f
Show file tree

Hide file tree

Showing 48 changed files with 13,082 additions and 2,179 deletions.
diff --git a/docs/licenses/License Attribution.txt b/docs/licenses/License Attribution.txt
@@ -22,7 +22,8 @@ FMMIDI library - Copyright (c) 2003-2006 yuno
 
 Freedoom (various assets) - Copyright (c) 2001-2019 Contributors to the Freedoom project
 
-IBXM - Copyright (c) 2019 Martin Cameron
+Mod4Play library - 	Copyright (c) 2024 dashodanger
+					Copyright (c) 2022 Olav Sørensen
 
 ZDoom FName implementation - Copyright (c) 2005-2007 Randy Heit
 

diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
@@ -10,9 +10,6 @@ else()
   add_subdirectory(gl4es)
 endif()
 add_subdirectory(hmm)
-if (EDGE_TRACKER_SUPPORT)
-  add_subdirectory(ibxm)
-endif()
 add_subdirectory(libemidi)
 if (EDGE_IMF_SUPPORT OR EDGE_RAD_SUPPORT)
   add_subdirectory(libRAD)
@@ -21,6 +18,9 @@ if (EDGE_VWAD_SUPPORT)
   add_subdirectory(libvwad)
 endif()
 add_subdirectory(lua)
+if (EDGE_TRACKER_SUPPORT)
+  add_subdirectory(m4p)
+endif()
 add_subdirectory(miniz)
 add_subdirectory(pl_mpeg)
 add_subdirectory(prns)

diff --git a/libraries/ibxm/CMakeLists.txt b/libraries/ibxm/CMakeLists.txt
diff --git a/libraries/ibxm/LICENSE b/libraries/ibxm/LICENSE