move src/mt32 to src/libs/mt32

2025-10-15 03:48:24 +08:00 · 2020-09-23 12:01:48 -04:00
parent f8ad923aa0
commit 923f7e24f6
65 changed files with 192 additions and 192 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -188,10 +188,10 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/gui_tk/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/porttalk/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/zmbv/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/mt32/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/mt32/freeverb/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/libs/mt32/sha1/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/misc/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/mt32/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/mt32/freeverb/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/mt32/sha1/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/platform/CMakeLists.txt)
 include(${CMAKE_CURRENT_SOURCE_DIR}/src/shell/CMakeLists.txt)
@@ -278,7 +278,7 @@ include_directories("src/hardware/snd_pc98/x11")
 include_directories("${ZLIB_INCLUDE_DIR}/SDL2") # nasty hack (vcpkg-specific)
 if (NOT MSVC)
-	# x86 intrinsic include in src/mt32/mmath.h fails on bare i686 target
+	# x86 intrinsic include in src/libs/mt32/mmath.h fails on bare i686 target
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
 endif ()
--- a/configure.ac
+++ b/configure.ac
@@ -1068,7 +1068,7 @@ src/debug/Makefile
 src/dos/Makefile
 src/fpu/Makefile
 src/gui/Makefile
-src/mt32/Makefile
+src/libs/mt32/Makefile
 src/hardware/Makefile
 src/hardware/mame/Makefile
 src/hardware/serialport/Makefile
--- a/ref-nmake/nMakefile
+++ b/ref-nmake/nMakefile
@@ -326,7 +326,7 @@ OBJS_D3D =	$(DBX_PATH)\src\output\direct3d\direct3d.obj \
 			$(DBX_PATH)\src\output\direct3d\ScalingEffect.obj
 OBJS4 = $(OBJS4) $(OBJS_MT32)
-CXXFLAGS = $(CXXFLAGS) -I$(DBX_PATH)/src/mt32
+CXXFLAGS = $(CXXFLAGS) -I$(DBX_PATH)/src/libs/mt32
 LIBS = kernel32.lib user32.lib gdi32.lib imm32.lib winmm.lib dxguid.lib shell32.lib ole32.lib comdlg32.lib opengl32.lib advapi32.lib ws2_32.lib deps\sdl.lib deps\sdlmain.lib deps\z.lib deps\png.lib deps\pdcurses.lib
--- a/ref-static-makefiles/make_mgw/Makefile
+++ b/ref-static-makefiles/make_mgw/Makefile
@@ -88,13 +88,13 @@ CPPSRCS	=	$(DBX_PATH)/src/dosbox.cpp \
 			$(wildcard $(DBX_PATH)/src/shell/*.cpp) \
 			$(wildcard $(DBX_PATH)/src/xBRZ/*.cpp)
-CPPSRCS_MT32 = $(wildcard $(DBX_PATH)/src/mt32/*.cpp) \
+CPPSRCS_MT32 = $(wildcard $(DBX_PATH)/src/libs/mt32/*.cpp) \
-			$(wildcard $(DBX_PATH)/src/mt32/freeverb/*.cpp) \
+			$(wildcard $(DBX_PATH)/src/libs/mt32/freeverb/*.cpp) \
-			$(wildcard $(DBX_PATH)/src/mt32/sha1/*.cpp)
+			$(wildcard $(DBX_PATH)/src/libs/mt32/sha1/*.cpp)
 OBJS_MT32 = $(addsuffix .o,$(basename $(CPPSRCS_MT32)))
-CXXFLAGS_MT32 = -DC_MT32=1 -I$(DBX_PATH)/src/mt32 -I$(DBX_PATH)/src/mt32/freeverb -I$(DBX_PATH)/src/mt32/sha1
+CXXFLAGS_MT32 = -DC_MT32=1 -I$(DBX_PATH)/src/libs/mt32 -I$(DBX_PATH)/src/libs/mt32/freeverb -I$(DBX_PATH)/src/libs/mt32/sha1
 OBJS = $(addsuffix .o,$(basename $(CPPSRCS)))
 LIBS = -static -lpng -lz -lm -lstdc++ $(shell sdl2-config --libs)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,6 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include "-DRESDIR=\"$(resdir)\""
-SUBDIRS = cpu debug dos fpu gui hardware libs ints misc shell builtin platform mt32 aviwriter output
+SUBDIRS = cpu debug dos fpu gui hardware libs ints misc shell builtin platform aviwriter output
 bin_PROGRAMS = dosbox-x
@@ -45,7 +45,7 @@ endif
 if C_MT32
 if !EMSCRIPTEN
-dosbox_x_LDADD += mt32/libmt32.a
+dosbox_x_LDADD += libs/mt32/libmt32.a
 endif
 endif
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -12,7 +12,7 @@ libgui_a_SOURCES = \
 	midi_coremidi.h sdl_gui.cpp dosbox_splash.h menu.cpp bitop.cpp ptrop.cpp zipcrc.c zipfile.cpp
 if C_MT32
-AM_CPPFLAGS += -I$(top_srcdir)/src/mt32
+AM_CPPFLAGS += -I$(top_srcdir)/src/libs/mt32
 libgui_a_SOURCES += \
 	midi_mt32.h
--- a/src/libs/Makefile.am
+++ b/src/libs/Makefile.am
@@ -1,4 +1,4 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-SUBDIRS = zmbv gui_tk porttalk
+SUBDIRS = zmbv gui_tk porttalk mt32
--- a/src/libs/mt32/AReverbModel.cpp
+++ b/src/libs/mt32/AReverbModel.cpp
--- a/src/libs/mt32/AReverbModel.h
+++ b/src/libs/mt32/AReverbModel.h
--- a/src/libs/mt32/BReverbModel.cpp
+++ b/src/libs/mt32/BReverbModel.cpp
--- a/src/libs/mt32/BReverbModel.h
+++ b/src/libs/mt32/BReverbModel.h
--- a/src/libs/mt32/CMakeLists.txt
+++ b/src/libs/mt32/CMakeLists.txt
--- a/src/libs/mt32/DelayReverb.cpp
+++ b/src/libs/mt32/DelayReverb.cpp
--- a/src/libs/mt32/DelayReverb.h
+++ b/src/libs/mt32/DelayReverb.h
--- a/src/libs/mt32/File.cpp
+++ b/src/libs/mt32/File.cpp
--- a/src/libs/mt32/File.h
+++ b/src/libs/mt32/File.h
--- a/src/libs/mt32/FileStream.cpp
+++ b/src/libs/mt32/FileStream.cpp
--- a/src/libs/mt32/FileStream.h
+++ b/src/libs/mt32/FileStream.h
--- a/src/libs/mt32/FreeverbModel.cpp
+++ b/src/libs/mt32/FreeverbModel.cpp
--- a/src/libs/mt32/FreeverbModel.h
+++ b/src/libs/mt32/FreeverbModel.h
--- a/src/libs/mt32/LA32Ramp.cpp
+++ b/src/libs/mt32/LA32Ramp.cpp
--- a/src/libs/mt32/LA32Ramp.h
+++ b/src/libs/mt32/LA32Ramp.h
--- a/src/libs/mt32/LA32WaveGenerator.cpp
+++ b/src/libs/mt32/LA32WaveGenerator.cpp
--- a/src/libs/mt32/LA32WaveGenerator.h
+++ b/src/libs/mt32/LA32WaveGenerator.h
--- a/src/libs/mt32/LegacyWaveGenerator.cpp
+++ b/src/libs/mt32/LegacyWaveGenerator.cpp
--- a/src/libs/mt32/LegacyWaveGenerator.h
+++ b/src/libs/mt32/LegacyWaveGenerator.h
--- a/src/libs/mt32/Makefile.am
+++ b/src/libs/mt32/Makefile.am
--- a/src/libs/mt32/Part.cpp
+++ b/src/libs/mt32/Part.cpp
--- a/src/libs/mt32/Part.h
+++ b/src/libs/mt32/Part.h
--- a/src/libs/mt32/Partial.cpp
+++ b/src/libs/mt32/Partial.cpp
--- a/src/libs/mt32/Partial.h
+++ b/src/libs/mt32/Partial.h
--- a/src/libs/mt32/PartialManager.cpp
+++ b/src/libs/mt32/PartialManager.cpp
--- a/src/libs/mt32/PartialManager.h
+++ b/src/libs/mt32/PartialManager.h
--- a/src/libs/mt32/Poly.cpp
+++ b/src/libs/mt32/Poly.cpp
--- a/src/libs/mt32/Poly.h
+++ b/src/libs/mt32/Poly.h
--- a/src/libs/mt32/ROMInfo.cpp
+++ b/src/libs/mt32/ROMInfo.cpp
--- a/src/libs/mt32/ROMInfo.h
+++ b/src/libs/mt32/ROMInfo.h
--- a/src/libs/mt32/Structures.h
+++ b/src/libs/mt32/Structures.h
--- a/src/libs/mt32/Synth.cpp
+++ b/src/libs/mt32/Synth.cpp
--- a/src/libs/mt32/Synth.h
+++ b/src/libs/mt32/Synth.h
--- a/src/libs/mt32/TVA.cpp
+++ b/src/libs/mt32/TVA.cpp
--- a/src/libs/mt32/TVA.h
+++ b/src/libs/mt32/TVA.h
--- a/src/libs/mt32/TVF.cpp
+++ b/src/libs/mt32/TVF.cpp
--- a/src/libs/mt32/TVF.h
+++ b/src/libs/mt32/TVF.h
--- a/src/libs/mt32/TVP.cpp
+++ b/src/libs/mt32/TVP.cpp
--- a/src/libs/mt32/TVP.h
+++ b/src/libs/mt32/TVP.h
--- a/src/libs/mt32/Tables.cpp
+++ b/src/libs/mt32/Tables.cpp
--- a/src/libs/mt32/Tables.h
+++ b/src/libs/mt32/Tables.h
--- a/src/libs/mt32/freeverb/CMakeLists.txt
+++ b/src/libs/mt32/freeverb/CMakeLists.txt
--- a/src/libs/mt32/freeverb/allpass.cpp
+++ b/src/libs/mt32/freeverb/allpass.cpp
--- a/src/libs/mt32/freeverb/allpass.h
+++ b/src/libs/mt32/freeverb/allpass.h
--- a/src/libs/mt32/freeverb/comb.cpp
+++ b/src/libs/mt32/freeverb/comb.cpp
--- a/src/libs/mt32/freeverb/comb.h
+++ b/src/libs/mt32/freeverb/comb.h
--- a/src/libs/mt32/freeverb/denormals.h
+++ b/src/libs/mt32/freeverb/denormals.h
--- a/src/libs/mt32/freeverb/revmodel.cpp
+++ b/src/libs/mt32/freeverb/revmodel.cpp
--- a/src/libs/mt32/freeverb/revmodel.h
+++ b/src/libs/mt32/freeverb/revmodel.h
--- a/src/libs/mt32/freeverb/tuning.h
+++ b/src/libs/mt32/freeverb/tuning.h
--- a/src/libs/mt32/mmath.h
+++ b/src/libs/mt32/mmath.h
--- a/src/libs/mt32/mt32emu.h
+++ b/src/libs/mt32/mt32emu.h
--- a/src/libs/mt32/sha1/CMakeLists.txt
+++ b/src/libs/mt32/sha1/CMakeLists.txt
--- a/src/libs/mt32/sha1/license.txt
+++ b/src/libs/mt32/sha1/license.txt
--- a/src/libs/mt32/sha1/sha1.cpp
+++ b/src/libs/mt32/sha1/sha1.cpp
--- a/src/libs/mt32/sha1/sha1.h
+++ b/src/libs/mt32/sha1/sha1.h
--- a/vs2015/dosbox-x.vcxproj
+++ b/vs2015/dosbox-x.vcxproj
@@ -327,7 +327,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -360,7 +360,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug SDL2|Win32'">
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -397,7 +397,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <WarningLevel>Level3</WarningLevel>
      <SDLCheck>false</SDLCheck>
@@ -428,7 +428,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
    <Midl />
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -459,7 +459,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    <Midl />
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -492,7 +492,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
      <TargetEnvironment>X64</TargetEnvironment>
    </Midl>
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -523,7 +523,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug SDL2|ARM64'">
    <Midl />
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -554,7 +554,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug SDL2|ARM'">
    <Midl />
    <ClCompile>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -585,7 +585,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
@@ -619,7 +619,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release SDL2|Win32'">
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -657,7 +657,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -689,7 +689,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
    <Midl />
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -721,7 +721,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
    <Midl />
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -755,7 +755,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
    </Midl>
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -787,7 +787,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
    <Midl />
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -819,7 +819,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
    <Midl />
    <ClCompile>
      <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)pcap;$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\include;$(SolutionDir)..\src;$(SolutionDir)..\src\aviwriter;$(SolutionDir)..\src\hardware\snd_pc98\cbus;$(SolutionDir)..\src\hardware\snd_pc98\common;$(SolutionDir)..\src\hardware\snd_pc98\generic;$(SolutionDir)..\src\hardware\snd_pc98\sound;$(SolutionDir)..\src\hardware\snd_pc98\x11;$(SolutionDir)..\src\hardware\snd_pc98\sound\getsnd;$(SolutionDir)..\src\libs\mt32;$(SolutionDir)libpdcurses;$(SolutionDir)zlib;$(SolutionDir)libpng;$(SolutionDir)freetype\include;$(SolutionDir)sdl2\include;$(SolutionDir)sdlnet;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
      <WarningLevel>Level3</WarningLevel>
@@ -962,42 +962,42 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
    <ClCompile Include="..\src\libs\zmbv\zmbv.cpp" />
    <ClCompile Include="..\src\misc\iconvpp.cpp" />
    <ClCompile Include="..\src\misc\shiftjis.cpp" />
-    <ClCompile Include="..\src\mt32\AReverbModel.cpp" />
+    <ClCompile Include="..\src\libs\mt32\AReverbModel.cpp" />
    <ClCompile Include="..\src\aviwriter\avi_rw_iobuf.cpp" />
    <ClCompile Include="..\src\aviwriter\avi_writer.cpp" />
-    <ClCompile Include="..\src\mt32\BReverbModel.cpp" />
+    <ClCompile Include="..\src\libs\mt32\BReverbModel.cpp" />
-    <ClCompile Include="..\src\mt32\DelayReverb.cpp" />
+    <ClCompile Include="..\src\libs\mt32\DelayReverb.cpp" />
-    <ClCompile Include="..\src\mt32\File.cpp" />
+    <ClCompile Include="..\src\libs\mt32\File.cpp" />
-    <ClCompile Include="..\src\mt32\FileStream.cpp" />
+    <ClCompile Include="..\src\libs\mt32\FileStream.cpp" />
-    <ClCompile Include="..\src\mt32\FreeverbModel.cpp" />
+    <ClCompile Include="..\src\libs\mt32\FreeverbModel.cpp" />
-    <ClCompile Include="..\src\mt32\freeverb\allpass.cpp" />
+    <ClCompile Include="..\src\libs\mt32\freeverb\allpass.cpp" />
-    <ClCompile Include="..\src\mt32\freeverb\comb.cpp" />
+    <ClCompile Include="..\src\libs\mt32\freeverb\comb.cpp" />
-    <ClCompile Include="..\src\mt32\freeverb\revmodel.cpp" />
+    <ClCompile Include="..\src\libs\mt32\freeverb\revmodel.cpp" />
    <ClCompile Include="..\src\aviwriter\guid.cpp" />
    <ClCompile Include="..\src\aviwriter\ksdataformat.cpp" />
-    <ClCompile Include="..\src\mt32\LA32Ramp.cpp" />
+    <ClCompile Include="..\src\libs\mt32\LA32Ramp.cpp" />
-    <ClCompile Include="..\src\mt32\LA32WaveGenerator.cpp" />
+    <ClCompile Include="..\src\libs\mt32\LA32WaveGenerator.cpp" />
-    <ClCompile Include="..\src\mt32\LegacyWaveGenerator.cpp" />
+    <ClCompile Include="..\src\libs\mt32\LegacyWaveGenerator.cpp" />
    <ClCompile Include="..\src\gui\menu.cpp" />
    <ClCompile Include="..\src\gui\midi.cpp" />
-    <ClCompile Include="..\src\mt32\Part.cpp" />
+    <ClCompile Include="..\src\libs\mt32\Part.cpp" />
-    <ClCompile Include="..\src\mt32\Partial.cpp" />
+    <ClCompile Include="..\src\libs\mt32\Partial.cpp" />
-    <ClCompile Include="..\src\mt32\PartialManager.cpp" />
+    <ClCompile Include="..\src\libs\mt32\PartialManager.cpp" />
-    <ClCompile Include="..\src\mt32\Poly.cpp" />
+    <ClCompile Include="..\src\libs\mt32\Poly.cpp" />
    <ClCompile Include="..\src\gui\render.cpp" />
    <ClCompile Include="..\src\gui\render_scalers.cpp" />
    <ClCompile Include="..\src\aviwriter\riff.cpp" />
    <ClCompile Include="..\src\aviwriter\riff_wav_writer.cpp" />
-    <ClCompile Include="..\src\mt32\ROMInfo.cpp" />
+    <ClCompile Include="..\src\libs\mt32\ROMInfo.cpp" />
    <ClCompile Include="..\src\gui\sdlmain.cpp" />
    <ClCompile Include="..\src\gui\sdl_gui.cpp" />
    <ClCompile Include="..\src\gui\sdl_mapper.cpp" />
-    <ClCompile Include="..\src\mt32\sha1\sha1.cpp" />
+    <ClCompile Include="..\src\libs\mt32\sha1\sha1.cpp" />
-    <ClCompile Include="..\src\mt32\Synth.cpp" />
+    <ClCompile Include="..\src\libs\mt32\Synth.cpp" />
-    <ClCompile Include="..\src\mt32\Tables.cpp" />
+    <ClCompile Include="..\src\libs\mt32\Tables.cpp" />
-    <ClCompile Include="..\src\mt32\TVA.cpp" />
+    <ClCompile Include="..\src\libs\mt32\TVA.cpp" />
-    <ClCompile Include="..\src\mt32\TVF.cpp" />
+    <ClCompile Include="..\src\libs\mt32\TVF.cpp" />
-    <ClCompile Include="..\src\mt32\TVP.cpp" />
+    <ClCompile Include="..\src\libs\mt32\TVP.cpp" />
    <ClCompile Include="..\src\hardware\adlib.cpp" />
    <ClCompile Include="..\src\hardware\cmos.cpp" />
    <ClCompile Include="..\src\hardware\dbopl.cpp" />
@@ -1396,34 +1396,34 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"</C
    <ClInclude Include="..\src\hardware\voodoo_vogl.h" />
    <ClInclude Include="..\src\ints\int10.h" />
    <ClInclude Include="..\src\ints\xms.h" />
-    <ClInclude Include="..\src\mt32\AReverbModel.h" />
+    <ClInclude Include="..\src\libs\mt32\AReverbModel.h" />
-    <ClInclude Include="..\src\mt32\BReverbModel.h" />
+    <ClInclude Include="..\src\libs\mt32\BReverbModel.h" />
-    <ClInclude Include="..\src\mt32\DelayReverb.h" />
+    <ClInclude Include="..\src\libs\mt32\DelayReverb.h" />
-    <ClInclude Include="..\src\mt32\File.h" />
+    <ClInclude Include="..\src\libs\mt32\File.h" />
-    <ClInclude Include="..\src\mt32\FileStream.h" />
+    <ClInclude Include="..\src\libs\mt32\FileStream.h" />
-    <ClInclude Include="..\src\mt32\FreeverbModel.h" />
+    <ClInclude Include="..\src\libs\mt32\FreeverbModel.h" />
-    <ClInclude Include="..\src\mt32\freeverb\allpass.h" />
+    <ClInclude Include="..\src\libs\mt32\freeverb\allpass.h" />
-    <ClInclude Include="..\src\mt32\freeverb\comb.h" />
+    <ClInclude Include="..\src\libs\mt32\freeverb\comb.h" />
-    <ClInclude Include="..\src\mt32\freeverb\denormals.h" />
+    <ClInclude Include="..\src\libs\mt32\freeverb\denormals.h" />
-    <ClInclude Include="..\src\mt32\freeverb\revmodel.h" />
+    <ClInclude Include="..\src\libs\mt32\freeverb\revmodel.h" />
-    <ClInclude Include="..\src\mt32\freeverb\tuning.h" />
+    <ClInclude Include="..\src\libs\mt32\freeverb\tuning.h" />
-    <ClInclude Include="..\src\mt32\LA32Ramp.h" />
+    <ClInclude Include="..\src\libs\mt32\LA32Ramp.h" />
-    <ClInclude Include="..\src\mt32\LA32WaveGenerator.h" />
+    <ClInclude Include="..\src\libs\mt32\LA32WaveGenerator.h" />
-    <ClInclude Include="..\src\mt32\LegacyWaveGenerator.h" />
+    <ClInclude Include="..\src\libs\mt32\LegacyWaveGenerator.h" />
-    <ClInclude Include="..\src\mt32\mmath.h" />
+    <ClInclude Include="..\src\libs\mt32\mmath.h" />
-    <ClInclude Include="..\src\mt32\mt32emu.h" />
+    <ClInclude Include="..\src\libs\mt32\mt32emu.h" />
-    <ClInclude Include="..\src\mt32\Part.h" />
+    <ClInclude Include="..\src\libs\mt32\Part.h" />
-    <ClInclude Include="..\src\mt32\Partial.h" />
+    <ClInclude Include="..\src\libs\mt32\Partial.h" />
-    <ClInclude Include="..\src\mt32\PartialManager.h" />
+    <ClInclude Include="..\src\libs\mt32\PartialManager.h" />
-    <ClInclude Include="..\src\mt32\Poly.h" />
+    <ClInclude Include="..\src\libs\mt32\Poly.h" />
-    <ClInclude Include="..\src\mt32\ROMInfo.h" />
+    <ClInclude Include="..\src\libs\mt32\ROMInfo.h" />
-    <ClInclude Include="..\src\mt32\sha1\sha1.h" />
+    <ClInclude Include="..\src\libs\mt32\sha1\sha1.h" />
-    <ClInclude Include="..\src\mt32\Structures.h" />
+    <ClInclude Include="..\src\libs\mt32\Structures.h" />
-    <ClInclude Include="..\src\mt32\Synth.h" />
+    <ClInclude Include="..\src\libs\mt32\Synth.h" />
-    <ClInclude Include="..\src\mt32\Tables.h" />
+    <ClInclude Include="..\src\libs\mt32\Tables.h" />
-    <ClInclude Include="..\src\mt32\TVA.h" />
+    <ClInclude Include="..\src\libs\mt32\TVA.h" />
-    <ClInclude Include="..\src\mt32\TVF.h" />
+    <ClInclude Include="..\src\libs\mt32\TVF.h" />
-    <ClInclude Include="..\src\mt32\TVP.h" />
+    <ClInclude Include="..\src\libs\mt32\TVP.h" />
    <ClInclude Include="..\src\output\direct3d\d3d_components.h" />
    <ClInclude Include="..\src\output\direct3d\direct3d.h" />
    <ClInclude Include="..\src\output\direct3d\hq2x_d3d.h" />
--- a/vs2015/dosbox-x.vcxproj.filters
+++ b/vs2015/dosbox-x.vcxproj.filters
@@ -58,15 +58,6 @@
    <Filter Include="Sources\misc">
      <UniqueIdentifier>{5af65dcd-0cd1-4ee7-a026-ead87797f0df}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sources\mt32">
      <UniqueIdentifier>{100486ca-860f-43d4-a37d-3c5b6c9cf849}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sources\mt32\freeverb">
      <UniqueIdentifier>{1b000c8a-88a6-4d4c-9c0c-17fc2eddc9bc}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sources\mt32\sha1">
      <UniqueIdentifier>{4f7f2cfd-2b47-4f7b-9951-22375362f7fb}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sources\platform">
      <UniqueIdentifier>{8071adb6-9510-4483-a580-36c1e98cfd47}</UniqueIdentifier>
    </Filter>
@@ -118,6 +109,15 @@
    <Filter Include="Sources\libs\fluidsynth">
      <UniqueIdentifier>{ec267673-8195-4cd9-9a9b-8c4505d285be}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sources\libs\mt32">
      <UniqueIdentifier>{100486ca-860f-43d4-a37d-3c5b6c9cf849}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sources\libs\mt32\freeverb">
      <UniqueIdentifier>{1b000c8a-88a6-4d4c-9c0c-17fc2eddc9bc}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sources\libs\mt32\sha1">
      <UniqueIdentifier>{4f7f2cfd-2b47-4f7b-9951-22375362f7fb}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\src\aviwriter\avi_rw_iobuf.cpp">
@@ -621,74 +621,74 @@
    <ClCompile Include="..\src\misc\support.cpp">
      <Filter>Sources\misc</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\AReverbModel.cpp">
+    <ClCompile Include="..\src\libs\mt32\AReverbModel.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\BReverbModel.cpp">
+    <ClCompile Include="..\src\libs\mt32\BReverbModel.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\DelayReverb.cpp">
+    <ClCompile Include="..\src\libs\mt32\DelayReverb.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\File.cpp">
+    <ClCompile Include="..\src\libs\mt32\File.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\FileStream.cpp">
+    <ClCompile Include="..\src\libs\mt32\FileStream.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\FreeverbModel.cpp">
+    <ClCompile Include="..\src\libs\mt32\FreeverbModel.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\LA32Ramp.cpp">
+    <ClCompile Include="..\src\libs\mt32\LA32Ramp.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\LA32WaveGenerator.cpp">
+    <ClCompile Include="..\src\libs\mt32\LA32WaveGenerator.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\LegacyWaveGenerator.cpp">
+    <ClCompile Include="..\src\libs\mt32\LegacyWaveGenerator.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\Part.cpp">
+    <ClCompile Include="..\src\libs\mt32\Part.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\Partial.cpp">
+    <ClCompile Include="..\src\libs\mt32\Partial.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\PartialManager.cpp">
+    <ClCompile Include="..\src\libs\mt32\PartialManager.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\Poly.cpp">
+    <ClCompile Include="..\src\libs\mt32\Poly.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\ROMInfo.cpp">
+    <ClCompile Include="..\src\libs\mt32\ROMInfo.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\Synth.cpp">
+    <ClCompile Include="..\src\libs\mt32\Synth.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\Tables.cpp">
+    <ClCompile Include="..\src\libs\mt32\Tables.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\TVA.cpp">
+    <ClCompile Include="..\src\libs\mt32\TVA.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\TVF.cpp">
+    <ClCompile Include="..\src\libs\mt32\TVF.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\TVP.cpp">
+    <ClCompile Include="..\src\libs\mt32\TVP.cpp">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\freeverb\allpass.cpp">
+    <ClCompile Include="..\src\libs\mt32\freeverb\allpass.cpp">
-      <Filter>Sources\mt32\freeverb</Filter>
+      <Filter>Sources\libs\mt32\freeverb</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\freeverb\comb.cpp">
+    <ClCompile Include="..\src\libs\mt32\freeverb\comb.cpp">
-      <Filter>Sources\mt32\freeverb</Filter>
+      <Filter>Sources\libs\mt32\freeverb</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\freeverb\revmodel.cpp">
+    <ClCompile Include="..\src\libs\mt32\freeverb\revmodel.cpp">
-      <Filter>Sources\mt32\freeverb</Filter>
+      <Filter>Sources\libs\mt32\freeverb</Filter>
    </ClCompile>
-    <ClCompile Include="..\src\mt32\sha1\sha1.cpp">
+    <ClCompile Include="..\src\libs\mt32\sha1\sha1.cpp">
-      <Filter>Sources\mt32\sha1</Filter>
+      <Filter>Sources\libs\mt32\sha1</Filter>
    </ClCompile>
    <ClCompile Include="..\src\shell\shell.cpp">
      <Filter>Sources\shell</Filter>
@@ -1250,89 +1250,89 @@
    <ClInclude Include="..\src\ints\int10.h">
      <Filter>Sources\ints</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\AReverbModel.h">
+    <ClInclude Include="..\src\libs\mt32\AReverbModel.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\BReverbModel.h">
+    <ClInclude Include="..\src\libs\mt32\BReverbModel.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\DelayReverb.h">
+    <ClInclude Include="..\src\libs\mt32\DelayReverb.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\File.h">
+    <ClInclude Include="..\src\libs\mt32\File.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\FileStream.h">
+    <ClInclude Include="..\src\libs\mt32\FileStream.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\FreeverbModel.h">
+    <ClInclude Include="..\src\libs\mt32\FreeverbModel.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\LA32Ramp.h">
+    <ClInclude Include="..\src\libs\mt32\LA32Ramp.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\LA32WaveGenerator.h">
+    <ClInclude Include="..\src\libs\mt32\LA32WaveGenerator.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\LegacyWaveGenerator.h">
+    <ClInclude Include="..\src\libs\mt32\LegacyWaveGenerator.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\mmath.h">
+    <ClInclude Include="..\src\libs\mt32\mmath.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\mt32emu.h">
+    <ClInclude Include="..\src\libs\mt32\mt32emu.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\Part.h">
+    <ClInclude Include="..\src\libs\mt32\Part.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\Partial.h">
+    <ClInclude Include="..\src\libs\mt32\Partial.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\PartialManager.h">
+    <ClInclude Include="..\src\libs\mt32\PartialManager.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\Poly.h">
+    <ClInclude Include="..\src\libs\mt32\Poly.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\ROMInfo.h">
+    <ClInclude Include="..\src\libs\mt32\ROMInfo.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\Structures.h">
+    <ClInclude Include="..\src\libs\mt32\Structures.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\Synth.h">
+    <ClInclude Include="..\src\libs\mt32\Synth.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\Tables.h">
+    <ClInclude Include="..\src\libs\mt32\Tables.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\TVA.h">
+    <ClInclude Include="..\src\libs\mt32\TVA.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\TVF.h">
+    <ClInclude Include="..\src\libs\mt32\TVF.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\TVP.h">
+    <ClInclude Include="..\src\libs\mt32\TVP.h">
-      <Filter>Sources\mt32</Filter>
+      <Filter>Sources\libs\mt32</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\freeverb\allpass.h">
+    <ClInclude Include="..\src\libs\mt32\freeverb\allpass.h">
-      <Filter>Sources\mt32\freeverb</Filter>
+      <Filter>Sources\libs\mt32\freeverb</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\freeverb\comb.h">
+    <ClInclude Include="..\src\libs\mt32\freeverb\comb.h">
-      <Filter>Sources\mt32\freeverb</Filter>
+      <Filter>Sources\libs\mt32\freeverb</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\freeverb\denormals.h">
+    <ClInclude Include="..\src\libs\mt32\freeverb\denormals.h">
-      <Filter>Sources\mt32\freeverb</Filter>
+      <Filter>Sources\libs\mt32\freeverb</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\freeverb\revmodel.h">
+    <ClInclude Include="..\src\libs\mt32\freeverb\revmodel.h">
-      <Filter>Sources\mt32\freeverb</Filter>
+      <Filter>Sources\libs\mt32\freeverb</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\freeverb\tuning.h">
+    <ClInclude Include="..\src\libs\mt32\freeverb\tuning.h">
-      <Filter>Sources\mt32\freeverb</Filter>
+      <Filter>Sources\libs\mt32\freeverb</Filter>
    </ClInclude>
-    <ClInclude Include="..\src\mt32\sha1\sha1.h">
+    <ClInclude Include="..\src\libs\mt32\sha1\sha1.h">
-      <Filter>Sources\mt32\sha1</Filter>
+      <Filter>Sources\libs\mt32\sha1</Filter>
    </ClInclude>
    <ClInclude Include="..\src\hardware\reSID\envelope.h">
      <Filter>Sources\hardware\reSID</Filter>
`@@ -1,4 +1,4 @@`
	`AM_CPPFLAGS = -I$(top_srcdir)/include`	`AM_CPPFLAGS = -I$(top_srcdir)/include`

	`SUBDIRS = zmbv gui_tk porttalk`	`SUBDIRS = zmbv gui_tk porttalk mt32`