From 923f7e24f6c48c23520a23a77ce4a5a36e131bfd Mon Sep 17 00:00:00 2001 From: Wengier Date: Wed, 23 Sep 2020 12:01:48 -0400 Subject: [PATCH] move src/mt32 to src/libs/mt32 --- CMakeLists.txt | 8 +- configure.ac | 2 +- ref-nmake/nMakefile | 2 +- ref-static-makefiles/make_mgw/Makefile | 8 +- src/Makefile.am | 4 +- src/gui/Makefile.am | 2 +- src/libs/Makefile.am | 2 +- src/{ => libs}/mt32/AReverbModel.cpp | 0 src/{ => libs}/mt32/AReverbModel.h | 0 src/{ => libs}/mt32/BReverbModel.cpp | 0 src/{ => libs}/mt32/BReverbModel.h | 0 src/{ => libs}/mt32/CMakeLists.txt | 0 src/{ => libs}/mt32/DelayReverb.cpp | 0 src/{ => libs}/mt32/DelayReverb.h | 0 src/{ => libs}/mt32/File.cpp | 0 src/{ => libs}/mt32/File.h | 0 src/{ => libs}/mt32/FileStream.cpp | 0 src/{ => libs}/mt32/FileStream.h | 0 src/{ => libs}/mt32/FreeverbModel.cpp | 0 src/{ => libs}/mt32/FreeverbModel.h | 0 src/{ => libs}/mt32/LA32Ramp.cpp | 0 src/{ => libs}/mt32/LA32Ramp.h | 0 src/{ => libs}/mt32/LA32WaveGenerator.cpp | 0 src/{ => libs}/mt32/LA32WaveGenerator.h | 0 src/{ => libs}/mt32/LegacyWaveGenerator.cpp | 0 src/{ => libs}/mt32/LegacyWaveGenerator.h | 0 src/{ => libs}/mt32/Makefile.am | 0 src/{ => libs}/mt32/Part.cpp | 0 src/{ => libs}/mt32/Part.h | 0 src/{ => libs}/mt32/Partial.cpp | 0 src/{ => libs}/mt32/Partial.h | 0 src/{ => libs}/mt32/PartialManager.cpp | 0 src/{ => libs}/mt32/PartialManager.h | 0 src/{ => libs}/mt32/Poly.cpp | 0 src/{ => libs}/mt32/Poly.h | 0 src/{ => libs}/mt32/ROMInfo.cpp | 0 src/{ => libs}/mt32/ROMInfo.h | 0 src/{ => libs}/mt32/Structures.h | 0 src/{ => libs}/mt32/Synth.cpp | 0 src/{ => libs}/mt32/Synth.h | 0 src/{ => libs}/mt32/TVA.cpp | 0 src/{ => libs}/mt32/TVA.h | 0 src/{ => libs}/mt32/TVF.cpp | 0 src/{ => libs}/mt32/TVF.h | 0 src/{ => libs}/mt32/TVP.cpp | 0 src/{ => libs}/mt32/TVP.h | 0 src/{ => libs}/mt32/Tables.cpp | 0 src/{ => libs}/mt32/Tables.h | 0 src/{ => libs}/mt32/freeverb/CMakeLists.txt | 0 src/{ => libs}/mt32/freeverb/allpass.cpp | 0 src/{ => libs}/mt32/freeverb/allpass.h | 0 src/{ => libs}/mt32/freeverb/comb.cpp | 0 src/{ => libs}/mt32/freeverb/comb.h | 0 src/{ => libs}/mt32/freeverb/denormals.h | 0 src/{ => libs}/mt32/freeverb/revmodel.cpp | 0 src/{ => libs}/mt32/freeverb/revmodel.h | 0 src/{ => libs}/mt32/freeverb/tuning.h | 0 src/{ => libs}/mt32/mmath.h | 0 src/{ => libs}/mt32/mt32emu.h | 0 src/{ => libs}/mt32/sha1/CMakeLists.txt | 0 src/{ => libs}/mt32/sha1/license.txt | 0 src/{ => libs}/mt32/sha1/sha1.cpp | 0 src/{ => libs}/mt32/sha1/sha1.h | 0 vs2015/dosbox-x.vcxproj | 134 ++++++------ vs2015/dosbox-x.vcxproj.filters | 222 ++++++++++---------- 65 files changed, 192 insertions(+), 192 deletions(-) rename src/{ => libs}/mt32/AReverbModel.cpp (100%) rename src/{ => libs}/mt32/AReverbModel.h (100%) rename src/{ => libs}/mt32/BReverbModel.cpp (100%) rename src/{ => libs}/mt32/BReverbModel.h (100%) rename src/{ => libs}/mt32/CMakeLists.txt (100%) rename src/{ => libs}/mt32/DelayReverb.cpp (100%) rename src/{ => libs}/mt32/DelayReverb.h (100%) rename src/{ => libs}/mt32/File.cpp (100%) rename src/{ => libs}/mt32/File.h (100%) rename src/{ => libs}/mt32/FileStream.cpp (100%) rename src/{ => libs}/mt32/FileStream.h (100%) rename src/{ => libs}/mt32/FreeverbModel.cpp (100%) rename src/{ => libs}/mt32/FreeverbModel.h (100%) rename src/{ => libs}/mt32/LA32Ramp.cpp (100%) rename src/{ => libs}/mt32/LA32Ramp.h (100%) rename src/{ => libs}/mt32/LA32WaveGenerator.cpp (100%) rename src/{ => libs}/mt32/LA32WaveGenerator.h (100%) rename src/{ => libs}/mt32/LegacyWaveGenerator.cpp (100%) rename src/{ => libs}/mt32/LegacyWaveGenerator.h (100%) rename src/{ => libs}/mt32/Makefile.am (100%) rename src/{ => libs}/mt32/Part.cpp (100%) rename src/{ => libs}/mt32/Part.h (100%) rename src/{ => libs}/mt32/Partial.cpp (100%) rename src/{ => libs}/mt32/Partial.h (100%) rename src/{ => libs}/mt32/PartialManager.cpp (100%) rename src/{ => libs}/mt32/PartialManager.h (100%) rename src/{ => libs}/mt32/Poly.cpp (100%) rename src/{ => libs}/mt32/Poly.h (100%) rename src/{ => libs}/mt32/ROMInfo.cpp (100%) rename src/{ => libs}/mt32/ROMInfo.h (100%) rename src/{ => libs}/mt32/Structures.h (100%) rename src/{ => libs}/mt32/Synth.cpp (100%) rename src/{ => libs}/mt32/Synth.h (100%) rename src/{ => libs}/mt32/TVA.cpp (100%) rename src/{ => libs}/mt32/TVA.h (100%) rename src/{ => libs}/mt32/TVF.cpp (100%) rename src/{ => libs}/mt32/TVF.h (100%) rename src/{ => libs}/mt32/TVP.cpp (100%) rename src/{ => libs}/mt32/TVP.h (100%) rename src/{ => libs}/mt32/Tables.cpp (100%) rename src/{ => libs}/mt32/Tables.h (100%) rename src/{ => libs}/mt32/freeverb/CMakeLists.txt (100%) rename src/{ => libs}/mt32/freeverb/allpass.cpp (100%) rename src/{ => libs}/mt32/freeverb/allpass.h (100%) rename src/{ => libs}/mt32/freeverb/comb.cpp (100%) rename src/{ => libs}/mt32/freeverb/comb.h (100%) rename src/{ => libs}/mt32/freeverb/denormals.h (100%) rename src/{ => libs}/mt32/freeverb/revmodel.cpp (100%) rename src/{ => libs}/mt32/freeverb/revmodel.h (100%) rename src/{ => libs}/mt32/freeverb/tuning.h (100%) rename src/{ => libs}/mt32/mmath.h (100%) rename src/{ => libs}/mt32/mt32emu.h (100%) rename src/{ => libs}/mt32/sha1/CMakeLists.txt (100%) rename src/{ => libs}/mt32/sha1/license.txt (100%) rename src/{ => libs}/mt32/sha1/sha1.cpp (100%) rename src/{ => libs}/mt32/sha1/sha1.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index b19c96122..8378cef39 100644 --- 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 () diff --git a/configure.ac b/configure.ac index f29fa4b60..c7397ccc5 100644 --- 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 diff --git a/ref-nmake/nMakefile b/ref-nmake/nMakefile index c73cfcd8a..08983e480 100644 --- 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 diff --git a/ref-static-makefiles/make_mgw/Makefile b/ref-static-makefiles/make_mgw/Makefile index 9b40bd681..e347ccfa3 100644 --- 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) \ - $(wildcard $(DBX_PATH)/src/mt32/freeverb/*.cpp) \ - $(wildcard $(DBX_PATH)/src/mt32/sha1/*.cpp) +CPPSRCS_MT32 = $(wildcard $(DBX_PATH)/src/libs/mt32/*.cpp) \ + $(wildcard $(DBX_PATH)/src/libs/mt32/freeverb/*.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) diff --git a/src/Makefile.am b/src/Makefile.am index 60f285baa..13cea262e 100644 --- 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 diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index f8763763b..8535f4d28 100644 --- 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 diff --git a/src/libs/Makefile.am b/src/libs/Makefile.am index 4b227a757..34dd7c9e5 100644 --- 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 diff --git a/src/mt32/AReverbModel.cpp b/src/libs/mt32/AReverbModel.cpp similarity index 100% rename from src/mt32/AReverbModel.cpp rename to src/libs/mt32/AReverbModel.cpp diff --git a/src/mt32/AReverbModel.h b/src/libs/mt32/AReverbModel.h similarity index 100% rename from src/mt32/AReverbModel.h rename to src/libs/mt32/AReverbModel.h diff --git a/src/mt32/BReverbModel.cpp b/src/libs/mt32/BReverbModel.cpp similarity index 100% rename from src/mt32/BReverbModel.cpp rename to src/libs/mt32/BReverbModel.cpp diff --git a/src/mt32/BReverbModel.h b/src/libs/mt32/BReverbModel.h similarity index 100% rename from src/mt32/BReverbModel.h rename to src/libs/mt32/BReverbModel.h diff --git a/src/mt32/CMakeLists.txt b/src/libs/mt32/CMakeLists.txt similarity index 100% rename from src/mt32/CMakeLists.txt rename to src/libs/mt32/CMakeLists.txt diff --git a/src/mt32/DelayReverb.cpp b/src/libs/mt32/DelayReverb.cpp similarity index 100% rename from src/mt32/DelayReverb.cpp rename to src/libs/mt32/DelayReverb.cpp diff --git a/src/mt32/DelayReverb.h b/src/libs/mt32/DelayReverb.h similarity index 100% rename from src/mt32/DelayReverb.h rename to src/libs/mt32/DelayReverb.h diff --git a/src/mt32/File.cpp b/src/libs/mt32/File.cpp similarity index 100% rename from src/mt32/File.cpp rename to src/libs/mt32/File.cpp diff --git a/src/mt32/File.h b/src/libs/mt32/File.h similarity index 100% rename from src/mt32/File.h rename to src/libs/mt32/File.h diff --git a/src/mt32/FileStream.cpp b/src/libs/mt32/FileStream.cpp similarity index 100% rename from src/mt32/FileStream.cpp rename to src/libs/mt32/FileStream.cpp diff --git a/src/mt32/FileStream.h b/src/libs/mt32/FileStream.h similarity index 100% rename from src/mt32/FileStream.h rename to src/libs/mt32/FileStream.h diff --git a/src/mt32/FreeverbModel.cpp b/src/libs/mt32/FreeverbModel.cpp similarity index 100% rename from src/mt32/FreeverbModel.cpp rename to src/libs/mt32/FreeverbModel.cpp diff --git a/src/mt32/FreeverbModel.h b/src/libs/mt32/FreeverbModel.h similarity index 100% rename from src/mt32/FreeverbModel.h rename to src/libs/mt32/FreeverbModel.h diff --git a/src/mt32/LA32Ramp.cpp b/src/libs/mt32/LA32Ramp.cpp similarity index 100% rename from src/mt32/LA32Ramp.cpp rename to src/libs/mt32/LA32Ramp.cpp diff --git a/src/mt32/LA32Ramp.h b/src/libs/mt32/LA32Ramp.h similarity index 100% rename from src/mt32/LA32Ramp.h rename to src/libs/mt32/LA32Ramp.h diff --git a/src/mt32/LA32WaveGenerator.cpp b/src/libs/mt32/LA32WaveGenerator.cpp similarity index 100% rename from src/mt32/LA32WaveGenerator.cpp rename to src/libs/mt32/LA32WaveGenerator.cpp diff --git a/src/mt32/LA32WaveGenerator.h b/src/libs/mt32/LA32WaveGenerator.h similarity index 100% rename from src/mt32/LA32WaveGenerator.h rename to src/libs/mt32/LA32WaveGenerator.h diff --git a/src/mt32/LegacyWaveGenerator.cpp b/src/libs/mt32/LegacyWaveGenerator.cpp similarity index 100% rename from src/mt32/LegacyWaveGenerator.cpp rename to src/libs/mt32/LegacyWaveGenerator.cpp diff --git a/src/mt32/LegacyWaveGenerator.h b/src/libs/mt32/LegacyWaveGenerator.h similarity index 100% rename from src/mt32/LegacyWaveGenerator.h rename to src/libs/mt32/LegacyWaveGenerator.h diff --git a/src/mt32/Makefile.am b/src/libs/mt32/Makefile.am similarity index 100% rename from src/mt32/Makefile.am rename to src/libs/mt32/Makefile.am diff --git a/src/mt32/Part.cpp b/src/libs/mt32/Part.cpp similarity index 100% rename from src/mt32/Part.cpp rename to src/libs/mt32/Part.cpp diff --git a/src/mt32/Part.h b/src/libs/mt32/Part.h similarity index 100% rename from src/mt32/Part.h rename to src/libs/mt32/Part.h diff --git a/src/mt32/Partial.cpp b/src/libs/mt32/Partial.cpp similarity index 100% rename from src/mt32/Partial.cpp rename to src/libs/mt32/Partial.cpp diff --git a/src/mt32/Partial.h b/src/libs/mt32/Partial.h similarity index 100% rename from src/mt32/Partial.h rename to src/libs/mt32/Partial.h diff --git a/src/mt32/PartialManager.cpp b/src/libs/mt32/PartialManager.cpp similarity index 100% rename from src/mt32/PartialManager.cpp rename to src/libs/mt32/PartialManager.cpp diff --git a/src/mt32/PartialManager.h b/src/libs/mt32/PartialManager.h similarity index 100% rename from src/mt32/PartialManager.h rename to src/libs/mt32/PartialManager.h diff --git a/src/mt32/Poly.cpp b/src/libs/mt32/Poly.cpp similarity index 100% rename from src/mt32/Poly.cpp rename to src/libs/mt32/Poly.cpp diff --git a/src/mt32/Poly.h b/src/libs/mt32/Poly.h similarity index 100% rename from src/mt32/Poly.h rename to src/libs/mt32/Poly.h diff --git a/src/mt32/ROMInfo.cpp b/src/libs/mt32/ROMInfo.cpp similarity index 100% rename from src/mt32/ROMInfo.cpp rename to src/libs/mt32/ROMInfo.cpp diff --git a/src/mt32/ROMInfo.h b/src/libs/mt32/ROMInfo.h similarity index 100% rename from src/mt32/ROMInfo.h rename to src/libs/mt32/ROMInfo.h diff --git a/src/mt32/Structures.h b/src/libs/mt32/Structures.h similarity index 100% rename from src/mt32/Structures.h rename to src/libs/mt32/Structures.h diff --git a/src/mt32/Synth.cpp b/src/libs/mt32/Synth.cpp similarity index 100% rename from src/mt32/Synth.cpp rename to src/libs/mt32/Synth.cpp diff --git a/src/mt32/Synth.h b/src/libs/mt32/Synth.h similarity index 100% rename from src/mt32/Synth.h rename to src/libs/mt32/Synth.h diff --git a/src/mt32/TVA.cpp b/src/libs/mt32/TVA.cpp similarity index 100% rename from src/mt32/TVA.cpp rename to src/libs/mt32/TVA.cpp diff --git a/src/mt32/TVA.h b/src/libs/mt32/TVA.h similarity index 100% rename from src/mt32/TVA.h rename to src/libs/mt32/TVA.h diff --git a/src/mt32/TVF.cpp b/src/libs/mt32/TVF.cpp similarity index 100% rename from src/mt32/TVF.cpp rename to src/libs/mt32/TVF.cpp diff --git a/src/mt32/TVF.h b/src/libs/mt32/TVF.h similarity index 100% rename from src/mt32/TVF.h rename to src/libs/mt32/TVF.h diff --git a/src/mt32/TVP.cpp b/src/libs/mt32/TVP.cpp similarity index 100% rename from src/mt32/TVP.cpp rename to src/libs/mt32/TVP.cpp diff --git a/src/mt32/TVP.h b/src/libs/mt32/TVP.h similarity index 100% rename from src/mt32/TVP.h rename to src/libs/mt32/TVP.h diff --git a/src/mt32/Tables.cpp b/src/libs/mt32/Tables.cpp similarity index 100% rename from src/mt32/Tables.cpp rename to src/libs/mt32/Tables.cpp diff --git a/src/mt32/Tables.h b/src/libs/mt32/Tables.h similarity index 100% rename from src/mt32/Tables.h rename to src/libs/mt32/Tables.h diff --git a/src/mt32/freeverb/CMakeLists.txt b/src/libs/mt32/freeverb/CMakeLists.txt similarity index 100% rename from src/mt32/freeverb/CMakeLists.txt rename to src/libs/mt32/freeverb/CMakeLists.txt diff --git a/src/mt32/freeverb/allpass.cpp b/src/libs/mt32/freeverb/allpass.cpp similarity index 100% rename from src/mt32/freeverb/allpass.cpp rename to src/libs/mt32/freeverb/allpass.cpp diff --git a/src/mt32/freeverb/allpass.h b/src/libs/mt32/freeverb/allpass.h similarity index 100% rename from src/mt32/freeverb/allpass.h rename to src/libs/mt32/freeverb/allpass.h diff --git a/src/mt32/freeverb/comb.cpp b/src/libs/mt32/freeverb/comb.cpp similarity index 100% rename from src/mt32/freeverb/comb.cpp rename to src/libs/mt32/freeverb/comb.cpp diff --git a/src/mt32/freeverb/comb.h b/src/libs/mt32/freeverb/comb.h similarity index 100% rename from src/mt32/freeverb/comb.h rename to src/libs/mt32/freeverb/comb.h diff --git a/src/mt32/freeverb/denormals.h b/src/libs/mt32/freeverb/denormals.h similarity index 100% rename from src/mt32/freeverb/denormals.h rename to src/libs/mt32/freeverb/denormals.h diff --git a/src/mt32/freeverb/revmodel.cpp b/src/libs/mt32/freeverb/revmodel.cpp similarity index 100% rename from src/mt32/freeverb/revmodel.cpp rename to src/libs/mt32/freeverb/revmodel.cpp diff --git a/src/mt32/freeverb/revmodel.h b/src/libs/mt32/freeverb/revmodel.h similarity index 100% rename from src/mt32/freeverb/revmodel.h rename to src/libs/mt32/freeverb/revmodel.h diff --git a/src/mt32/freeverb/tuning.h b/src/libs/mt32/freeverb/tuning.h similarity index 100% rename from src/mt32/freeverb/tuning.h rename to src/libs/mt32/freeverb/tuning.h diff --git a/src/mt32/mmath.h b/src/libs/mt32/mmath.h similarity index 100% rename from src/mt32/mmath.h rename to src/libs/mt32/mmath.h diff --git a/src/mt32/mt32emu.h b/src/libs/mt32/mt32emu.h similarity index 100% rename from src/mt32/mt32emu.h rename to src/libs/mt32/mt32emu.h diff --git a/src/mt32/sha1/CMakeLists.txt b/src/libs/mt32/sha1/CMakeLists.txt similarity index 100% rename from src/mt32/sha1/CMakeLists.txt rename to src/libs/mt32/sha1/CMakeLists.txt diff --git a/src/mt32/sha1/license.txt b/src/libs/mt32/sha1/license.txt similarity index 100% rename from src/mt32/sha1/license.txt rename to src/libs/mt32/sha1/license.txt diff --git a/src/mt32/sha1/sha1.cpp b/src/libs/mt32/sha1/sha1.cpp similarity index 100% rename from src/mt32/sha1/sha1.cpp rename to src/libs/mt32/sha1/sha1.cpp diff --git a/src/mt32/sha1/sha1.h b/src/libs/mt32/sha1/sha1.h similarity index 100% rename from src/mt32/sha1/sha1.h rename to src/libs/mt32/sha1/sha1.h diff --git a/vs2015/dosbox-x.vcxproj b/vs2015/dosbox-x.vcxproj index 8e3fa5528..cf6b06a4e 100644 --- a/vs2015/dosbox-x.vcxproj +++ b/vs2015/dosbox-x.vcxproj @@ -327,7 +327,7 @@ - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -360,7 +360,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -397,7 +397,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"X64 - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) Level3 false @@ -428,7 +428,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -459,7 +459,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -492,7 +492,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\"X64 - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -523,7 +523,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -554,7 +554,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions) MultiThreadedDebug Level3 @@ -585,7 +585,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" MaxSpeed - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded Speed @@ -619,7 +619,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" MaxSpeed - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -657,7 +657,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" MaxSpeed - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -689,7 +689,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" MaxSpeed - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -721,7 +721,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" MaxSpeed - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -755,7 +755,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" MaxSpeed - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -787,7 +787,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" MaxSpeed - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -819,7 +819,7 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" MaxSpeed - $(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) + $(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) WIN32;__WIN32__;_CRT_SECURE_NO_WARNINGS;_FILE_OFFSET_BITS=64;C_SDL2=1;%(PreprocessorDefinitions) MultiThreaded Level3 @@ -962,42 +962,42 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" - + - - - - - - - - + + + + + + + + - - - + + + - - - - + + + + - + - - - - - - + + + + + + @@ -1396,34 +1396,34 @@ copy "$(SolutionDir)\..\contrib\windows\shaders\*.*" "$(OutputPath)\shaders\" - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/vs2015/dosbox-x.vcxproj.filters b/vs2015/dosbox-x.vcxproj.filters index 57798159d..18fb52591 100644 --- a/vs2015/dosbox-x.vcxproj.filters +++ b/vs2015/dosbox-x.vcxproj.filters @@ -58,15 +58,6 @@ {5af65dcd-0cd1-4ee7-a026-ead87797f0df} - - {100486ca-860f-43d4-a37d-3c5b6c9cf849} - - - {1b000c8a-88a6-4d4c-9c0c-17fc2eddc9bc} - - - {4f7f2cfd-2b47-4f7b-9951-22375362f7fb} - {8071adb6-9510-4483-a580-36c1e98cfd47} @@ -118,6 +109,15 @@ {ec267673-8195-4cd9-9a9b-8c4505d285be} + + {100486ca-860f-43d4-a37d-3c5b6c9cf849} + + + {1b000c8a-88a6-4d4c-9c0c-17fc2eddc9bc} + + + {4f7f2cfd-2b47-4f7b-9951-22375362f7fb} + @@ -621,74 +621,74 @@ Sources\misc - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32\freeverb + + Sources\libs\mt32\freeverb - - Sources\mt32\freeverb + + Sources\libs\mt32\freeverb - - Sources\mt32\freeverb + + Sources\libs\mt32\freeverb - - Sources\mt32\sha1 + + Sources\libs\mt32\sha1 Sources\shell @@ -1250,89 +1250,89 @@ Sources\ints - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32 + + Sources\libs\mt32 - - Sources\mt32\freeverb + + Sources\libs\mt32\freeverb - - Sources\mt32\freeverb + + Sources\libs\mt32\freeverb - - Sources\mt32\freeverb + + Sources\libs\mt32\freeverb - - Sources\mt32\freeverb + + Sources\libs\mt32\freeverb - - Sources\mt32\freeverb + + Sources\libs\mt32\freeverb - - Sources\mt32\sha1 + + Sources\libs\mt32\sha1 Sources\hardware\reSID