File system-libxmp.patch of Package zmusic

Overview Repositories Revisions Requests Users Attributes Meta

File system-libxmp.patch of Package zmusic

From: Jan Engelhardt <ej@inai.de>
Date: 2024-10-12 09:44:49.402360010 +0200

---
 source/CMakeLists.txt                 |    2 +-
 source/streamsources/music_libxmp.cpp |    3 +--
 thirdparty/CMakeLists.txt             |    1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

Index: source/CMakeLists.txt
===================================================================
--- source/CMakeLists.txt.orig
+++ source/CMakeLists.txt
@@ -128,7 +128,7 @@ if(WIN32)
 	)
 endif()
 
-target_link_libraries(zmusic-obj INTERFACE dumb gme libxmp ZLIB::ZLIB ${CMAKE_DL_LIBS})
+target_link_libraries(zmusic-obj INTERFACE dumb gme -lxmp ZLIB::ZLIB ${CMAKE_DL_LIBS})
 
 target_include_directories(zmusic-obj
 INTERFACE
Index: source/streamsources/music_libxmp.cpp
===================================================================
--- source/streamsources/music_libxmp.cpp.orig
+++ source/streamsources/music_libxmp.cpp
@@ -39,8 +39,7 @@
 #include <limits.h>
 #include "streamsource.h"
 
-#define LIBXMP_STATIC 1
-#include "../libxmp/include/xmp.h"
+#include <xmp.h>
 #include "zmusic/m_swap.h"
 #include "zmusic/mididefs.h"
 #include "zmusic/midiconfig.h"
Index: thirdparty/CMakeLists.txt
===================================================================
--- thirdparty/CMakeLists.txt.orig
+++ thirdparty/CMakeLists.txt
@@ -37,4 +37,3 @@ add_subdirectory(timidity)
 add_subdirectory(timidityplus)
 add_subdirectory(wildmidi)
 add_subdirectory(oplsynth)
-add_subdirectory(libxmp)

Places

File system-libxmp.patch of Package zmusic

Places