- made libadl its own library subproject.

This is to improve compile times because the MSVC compiler tends to become slow with large lists of source files in a single project.
This new project is still our stripped down copy of libadl, not the original, because that project contains a large amount of baggage we do not need.

# Conflicts:
#	src/CMakeLists.txt

# Conflicts:
#	src/sound/mididevices/music_adlmidi_mididevice.cpp

CMakeLists.txt

@@ -383,6 +383,7 @@ else()
 endif()
 
 set( LZMA_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/lzma/C" )
+set( ADL_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/libraries/adlmidi" )
 
 if( NOT CMAKE_CROSSCOMPILING )
 	if( NOT CROSS_EXPORTS )
@@ -404,6 +405,7 @@ add_subdirectory( libraries/lzma )
 add_subdirectory( tools )
 add_subdirectory( libraries/dumb )
 add_subdirectory( libraries/gdtoa )
+add_subdirectory( libraries/adlmidi )
 add_subdirectory( wadsrc )
 add_subdirectory( wadsrc_bm )
 add_subdirectory( wadsrc_lights )

libraries/adlmidi/CMakeLists.txt

@@ -0,0 +1,28 @@
+cmake_minimum_required( VERSION 2.8.7 )
+
+make_release_only()
+
+add_definitions(-DADLMIDI_DISABLE_MIDI_SEQUENCER)
+
+if( ZD_CMAKE_COMPILER_IS_GNUC_COMPATIBLE )
+	set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -fomit-frame-pointer" )
+endif()
+
+set (CMAKE_C_FLAGS ${CMAKE_C_FLAGS} ${ZD_FASTMATH_FLAG})
+
+add_library( adl STATIC
+	adldata.cpp
+	adlmidi.cpp
+	adlmidi_load.cpp
+	adlmidi_midiplay.cpp
+	adlmidi_opl3.cpp
+	adlmidi_private.cpp
+	chips/dosbox/dbopl.cpp
+	chips/dosbox_opl3.cpp
+	chips/nuked/nukedopl3_174.c
+	chips/nuked/nukedopl3.c
+	chips/nuked_opl3.cpp
+	chips/nuked_opl3_v174.cpp
+	wopl/wopl_file.c
+	)
+target_link_libraries( adl )

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}" )
+include_directories( "${ZLIB_INCLUDE_DIR}" "${BZIP2_INCLUDE_DIR}" "${LZMA_INCLUDE_DIR}" "${JPEG_INCLUDE_DIR}" "${GME_INCLUDE_DIR}" "${ADL_INCLUDE_DIR}" )
 
 if( ${HAVE_VM_JIT} )
 	add_definitions( -DHAVE_VM_JIT )
@@ -683,7 +683,6 @@ file( GLOB HEADER_FILES
 	intermission/*.h
 	menu/*.h
 	sound/*.h
-	sound/adlmidi/*.h*
 	sound/backend/*.h*
 	sound/music/*.h*
 	sound/opnmidi/*.h*
@@ -887,19 +886,6 @@ set( FASTMATH_SOURCES
 	gl/models/gl_models.cpp
 	r_data/models/models.cpp
 	r_data/matrix.cpp
-	sound/adlmidi/adldata.cpp
-	sound/adlmidi/adlmidi.cpp
-	sound/adlmidi/adlmidi_load.cpp
-	sound/adlmidi/adlmidi_midiplay.cpp
-	sound/adlmidi/adlmidi_opl3.cpp
-	sound/adlmidi/adlmidi_private.cpp
-	sound/adlmidi/chips/dosbox/dbopl.cpp
-	sound/adlmidi/chips/dosbox_opl3.cpp
-	sound/adlmidi/chips/nuked/nukedopl3_174.c
-	sound/adlmidi/chips/nuked/nukedopl3.c
-	sound/adlmidi/chips/nuked_opl3.cpp
-	sound/adlmidi/chips/nuked_opl3_v174.cpp
-	sound/adlmidi/wopl/wopl_file.c
 	sound/opnmidi/chips/gens_opn2.cpp
 	sound/opnmidi/chips/gens/Ym2612_Emu.cpp
 	sound/opnmidi/chips/mame/mame_ym2612fm.c
@@ -1356,7 +1342,7 @@ if( UNIX )
 	endif()
 endif()
 
-target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma )
+target_link_libraries( zdoom ${ZDOOM_LIBS} gdtoa dumb lzma adl )
 
 include_directories( .
 	g_statusbar

src/sound/mididevices/music_adlmidi_mididevice.cpp

@@ -35,12 +35,7 @@
 // HEADER FILES ------------------------------------------------------------
 
 #include "i_musicinterns.h"
-#include "templates.h"
-#include "doomdef.h"
-#include "m_swap.h"
-#include "w_wad.h"
-#include "v_text.h"
-#include "adlmidi/adlmidi.h"
+#include "adlmidi.h"
 #include "i_soundfont.h"
 
 class ADLMIDIDevice : public SoftSynthMIDIDevice