- made WildMidi a library.

# Conflicts:
#	src/CMakeLists.txt
#	src/sound/musicformats/music_xa.cpp

CMakeLists.txt

@@ -387,6 +387,7 @@ set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/adlmidi" )
 set( OPN_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/opnmidi" )
 set( TIMIDITYPP_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/timidityplus" )
 set( TIMIDITY_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/timidity" )
+set( WILDMIDI_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/wildmidi" )
 
 if( NOT CMAKE_CROSSCOMPILING )
 	if( NOT CROSS_EXPORTS )
@@ -412,6 +413,7 @@ add_subdirectory( libraries/adlmidi )
 add_subdirectory( libraries/opnmidi )
 add_subdirectory( libraries/timidity )
 add_subdirectory( libraries/timidityplus )
+add_subdirectory( libraries/wildmidi )
 add_subdirectory( wadsrc )
 add_subdirectory( wadsrc_bm )
 add_subdirectory( wadsrc_lights )

libraries/wildmidi/CMakeLists.txt

@@ -0,0 +1,24 @@
+cmake_minimum_required( VERSION 2.8.7 )
+
+make_release_only()
+
+if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
+	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
+	set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11" )
+endif()
+
+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ZD_FASTMATH_FLAG}")
+
+include_directories( wildmidi )
+
+file( GLOB HEADER_FILES
+	wildmidi/*.h
+	)
+add_library( wildmidi STATIC
+	file_io.cpp
+	gus_pat.cpp
+	reverb.cpp
+	wildmidi_lib.cpp
+	wm_error.cpp
+	)
+target_link_libraries( wildmidi )

libraries/wildmidi/wildmidi_lib.cpp

@@ -44,7 +44,7 @@
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <memory>
-#include <mutex>
+#include <algorithm>
 
 #include "common.h"
 #include "wm_error.h"

src/CMakeLists.txt

@@ -488,7 +488,7 @@ add_custom_target( revision_check ALL
 
 message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
 set( ZDOOM_LIBS ${ZDOOM_LIBS} "${ZLIB_LIBRARIES}" "${JPEG_LIBRARIES}" "${BZIP2_LIBRARIES}" "${GME_LIBRARIES}" "${CMAKE_DL_LIBS}" )
-include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" )
+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" "${OPN_INCLUDE_DIR}" "${TIMIDITYPP_INCLUDE_DIR}" "${TIMIDITY_INCLUDE_DIR}" "${WILDMIDI_INCLUDE_DIR}" )
 
 if( ${HAVE_VM_JIT} )
 	add_definitions( -DHAVE_VM_JIT )
@@ -699,7 +699,6 @@ file( GLOB HEADER_FILES
 	sound/oplsynth/*.h
 	sound/oplsynth/dosbox/*.h
 	sound/thirdparty/*.h
-	sound/wildmidi/*.h
 	xlat/*.h
 	swrenderer/*.h
 	swrenderer/drawers/*.h
@@ -1218,11 +1217,6 @@ set (PCH_SOURCES
 	sound/oplsynth/dosbox/opl.cpp
 	sound/oplsynth/OPL3.cpp
 	sound/oplsynth/nukedopl3.cpp
-	sound/wildmidi/file_io.cpp
-	sound/wildmidi/gus_pat.cpp
-	sound/wildmidi/reverb.cpp
-	sound/wildmidi/wildmidi_lib.cpp
-	sound/wildmidi/wm_error.cpp
 	events.cpp
 	atterm.cpp
 	GuillotineBinPack.cpp
@@ -1289,7 +1283,7 @@ if( UNIX )
 	endif()
 endif()
 
-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus )
+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl opn timidity timidityplus wildmidi )
 
 include_directories( .
 	g_statusbar
@@ -1299,7 +1293,6 @@ include_directories( .
 	sound/music
 	sound/backend
 	sound/oplsynth
-	sound/wildmidi
 	textures
 	xlat
 	scripting
@@ -1401,7 +1394,6 @@ source_group("Audio Files" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/soun
 source_group("Audio Files\\Backend" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/backend/.+")
 source_group("Audio Files\\OPL Synth" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/oplsynth/.+")
 source_group("Audio Files\\OPL Synth\\DOSBox" FILES sound/oplsynth/dosbox/opl.cpp sound/oplsynth/dosbox/opl.h)
-source_group("Audio Files\\WildMidi" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/wildmidi/.+")
 source_group("Audio Files\\MIDI Devices" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/mididevices/.+")
 source_group("Audio Files\\MIDI Sources" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/midisources/.+")
 source_group("Audio Files\\Music formats" REGULAR_EXPRESSION "^${CMAKE_CURRENT_SOURCE_DIR}/sound/musicformats/.+")

src/sound/music/i_soundfont.h

@@ -5,7 +5,7 @@
 #include "files.h"
 #include "timiditypp/timidity_file.h"
 #include "timidity/timidity_file.h"
-#include "wildmidi_file.h"
+#include "wildmidi/wildmidi_file.h"
 
 enum
 {