diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
index ea935f1f49441..c5b73368ddf17 100644
--- a/mscore/musescore.cpp
+++ b/mscore/musescore.cpp
@@ -7393,6 +7393,24 @@ MuseScoreApplication* MuseScoreApplication::initApplication(int& argc, char** ar
return app;
}
+//---------------------------------------------------------
+// setCustomConfigFolder
+//---------------------------------------------------------
+
+bool MuseScoreApplication::setCustomConfigFolder(const QString& path)
+ {
+ const QFileInfo pinfo(path);
+
+ if (pinfo.exists() && pinfo.isDir()) {
+ QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, path);
+ QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, path);
+ dataPath = path;
+ return true;
+ }
+
+ return false;
+ }
+
//---------------------------------------------------------
// parseCommandLineArguments
//---------------------------------------------------------
@@ -7553,12 +7571,7 @@ MuseScoreApplication::CommandLineParseResult MuseScoreApplication::parseCommandL
QString path = parser.value("c");
if (path.isEmpty())
parser.showHelp(EXIT_FAILURE);
- QDir dir;
- if (dir.exists(path)) {
- QSettings::setPath(QSettings::IniFormat, QSettings::UserScope, path);
- QSettings::setPath(QSettings::IniFormat, QSettings::SystemScope, path);
- dataPath = path;
- }
+ setCustomConfigFolder(path);
}
MScore::testMode = parser.isSet("t");
if (parser.isSet("M")) {
diff --git a/mscore/musescore.h b/mscore/musescore.h
index a81c14a9b3488..b0eec52f652d2 100644
--- a/mscore/musescore.h
+++ b/mscore/musescore.h
@@ -171,6 +171,8 @@ class MuseScoreApplication : public QtSingleApplication {
};
static CommandLineParseResult parseCommandLineArguments(MuseScoreApplication* app);
static MuseScoreApplication* initApplication(int& argc, char** argv);
+
+ static bool setCustomConfigFolder(const QString& path);
};
diff --git a/mtest/CMakeLists.txt b/mtest/CMakeLists.txt
index 3f4397881db82..16c4817620acd 100644
--- a/mtest/CMakeLists.txt
+++ b/mtest/CMakeLists.txt
@@ -13,6 +13,12 @@
# set(CMAKE_VERBOSE_MAKEFILE ON)
enable_testing()
+if (MSVC)
+ project(mtest)
+ set (PROJECT_BINARY_DIR ${PROJECT_BINARY_DIR}/..)
+ set (PROJECT_SOURCE_DIR ${PROJECT_SOURCE_DIR}/..)
+endif (MSVC)
+
include_directories(
${PROJECT_BINARY_DIR}
${PROJECT_SOURCE_DIR}
@@ -82,7 +88,7 @@ set (SOURCE_LIB
${PROJECT_SOURCE_DIR}/mscore/extension.cpp # required by zerberus tests
${OMR_SRC}
omr
- )
+ )
if (MSVC)
add_library(
@@ -146,7 +152,7 @@ endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
set_target_properties(testutils PROPERTIES COMPILE_FLAGS "${TESTUTILS_COMPILE_FLAGS}")
set_target_properties(testutils_mscoreapp PROPERTIES COMPILE_FLAGS "${TESTUTILS_COMPILE_FLAGS}")
-
+if (NOT MSVC)
add_custom_target(report
COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest report
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/mtest"
@@ -156,6 +162,7 @@ add_custom_target(reporthtml
COMMAND ant -f ${PROJECT_SOURCE_DIR}/mtest/build.xml -Droot.dir=${PROJECT_BINARY_DIR}/mtest reporthtml
WORKING_DIRECTORY "${PROJECT_BINARY_DIR}/mtest"
)
+endif (NOT MSVC)
subdirs (
libmscore/compat114
@@ -206,6 +213,7 @@ subdirs (
# libmscore/text work in progress...
libmscore/utils
mscore/workspaces
+ importmidi
capella
biab
musicxml
@@ -223,7 +231,7 @@ subdirs (
testscript
)
-
+if (NOT MSVC)
install(FILES
../share/styles/chords_std.xml
../share/styles/chords_jazz.xml
@@ -236,7 +244,7 @@ install(FILES
../share/styles/cchords_sym.xml
DESTINATION ${PROJECT_BINARY_DIR}/mtest/styles
)
-
+endif (NOT MSVC)
if (OMR)
subdirs(omr)
diff --git a/mtest/README.md b/mtest/README.md
index 9553d0c03abc3..7351b128ae0dd 100644
--- a/mtest/README.md
+++ b/mtest/README.md
@@ -4,10 +4,14 @@
To build all tests:
-| Linux | OSX | Windows |
-| ----- | --- | ------- |
+| Linux | OSX | Windows (MinGW) |
+| ----- | --- | --------------- |
| make debug
sudo make installdebug
cd build.debug/mtest
make | make -f Makefile.osx debug
make -f Makefile.osx installdebug
cd build.debug/mtest
make -f Makefile.osx | mingw32-make -f Makefile.mingw debug
mingw32-make -f Makefile.mingw installdebug
cd build.debug\mtest
mingw32-make -f Makefile.mingw |
+| Windows (MSVC) |
+| -------------- |
+| (Compile MuseScore in debug mode)
(Install MuseScore)
cd msvc.build_x64\mtest
cmake --build .
cmake --build . --target INSTALL |
+
To run all tests:
ctest
@@ -21,6 +25,8 @@ To see how the CI environment is doing it check `.travis.yml` and `build/run_tes
**Note: You need to have `diff` in your path. For Windows, get a copy of [diffutils for Windows](http://gnuwin32.sourceforge.net/packages/diffutils.htm "diffutils for Windows").**
+**Note-2: For Windows MSVC, you also need MuseScore installation bin folder (for example C:\MuseScore\msvc.install_x64\bin) in your path.**
+
## Test case conventions
Tests are grouped in directories by feature (like libmscore or mxl).
diff --git a/mtest/cmake.inc b/mtest/cmake.inc
index 3f550131d79bb..94774a4a6a33d 100644
--- a/mtest/cmake.inc
+++ b/mtest/cmake.inc
@@ -23,15 +23,33 @@ else (MTEST_LINK_MSCOREAPP)
target_link_libraries(${TARGET} testutils)
endif (MTEST_LINK_MSCOREAPP)
-target_link_libraries(
- ${TARGET}
- ${QT_QTTEST_LIBRARY}
- testResources
- libmscore
- audio
- qzip
- z
- )
+if (MSVC)
+ set(_all_h_file "${PROJECT_SOURCE_DIR}/all.h")
+ target_sources(${TARGET} PRIVATE
+ ${_all_h_file}
+ ${PCH}
+ )
+ include(FindStaticLibrary)
+ target_link_libraries(
+ ${TARGET}
+ ${QT_QTTEST_LIBRARY}
+ testResources
+ libmscore
+ audio
+ qzip
+ zlibstat
+ )
+else (MSVC)
+ target_link_libraries(
+ ${TARGET}
+ ${QT_QTTEST_LIBRARY}
+ testResources
+ libmscore
+ audio
+ qzip
+ z
+ )
+endif (MSVC)
if (OMR)
target_link_libraries(${TARGET} omr poppler-qt5)
@@ -40,11 +58,19 @@ if (OMR)
endif (OCR)
endif (OMR)
-target_link_libraries(
- ${TARGET}
- ${QT_LIBRARIES}
- z
- )
+if (MSVC)
+ target_link_libraries(
+ ${TARGET}
+ ${QT_LIBRARIES}
+ zlibstat
+ )
+else (MSVC)
+ target_link_libraries(
+ ${TARGET}
+ ${QT_LIBRARIES}
+ z
+ )
+endif (MSVC)
if (USE_SYSTEM_FREETYPE)
target_link_libraries(${TARGET} freetype)
@@ -52,11 +78,11 @@ else (USE_SYSTEM_FREETYPE)
target_link_libraries(${TARGET} mscore_freetype)
endif (USE_SYSTEM_FREETYPE)
-if (NOT MINGW AND NOT APPLE)
+if (NOT MINGW AND NOT APPLE AND NOT MSVC)
target_link_libraries(${TARGET}
dl
pthread)
-endif (NOT MINGW AND NOT APPLE)
+endif (NOT MINGW AND NOT APPLE AND NOT MSVC)
if (APPLE)
target_link_libraries(${TARGET} ${OsxFrameworks})
@@ -72,13 +98,22 @@ set_target_properties (
LINK_FLAGS "-g -stdlib=libc++"
)
else(APPLE)
-set_target_properties (
- ${TARGET}
- PROPERTIES
- AUTOMOC true
- COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
- LINK_FLAGS "-g"
- )
+ if (MSVC)
+ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+ COMPILE_FLAGS "/Zi ${PCH_INCLUDE} /D QT_GUI_LIB /D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\""
+ )
+ else (MSVC)
+ set_target_properties (
+ ${TARGET}
+ PROPERTIES
+ AUTOMOC true
+ COMPILE_FLAGS "-include all.h -D QT_GUI_LIB -D TESTROOT=\\\"${PROJECT_SOURCE_DIR}\\\" -g -Wall -Wextra"
+ LINK_FLAGS "-g"
+ )
+ endif (MSVC)
endif(APPLE)
if (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
@@ -90,3 +125,18 @@ set_target_properties (
endif (APPLE AND (CMAKE_VERSION VERSION_LESS "3.5.0"))
add_test(${TARGET} ${CMAKE_CURRENT_BINARY_DIR}/${TARGET} -xunitxml -o result.xml)
+
+if (MSVC)
+install(FILES
+ ${PROJECT_SOURCE_DIR}/share/styles/chords_std.xml
+ ${PROJECT_SOURCE_DIR}/share/styles/chords_jazz.xml
+ ${PROJECT_SOURCE_DIR}/share/styles/chords.xml
+ ${PROJECT_SOURCE_DIR}/share/styles/stdchords.xml
+ ${PROJECT_SOURCE_DIR}/share/styles/jazzchords.xml
+ ${PROJECT_SOURCE_DIR}/share/styles/cchords_muse.xml
+ ${PROJECT_SOURCE_DIR}/share/styles/cchords_nrb.xml
+ ${PROJECT_SOURCE_DIR}/share/styles/cchords_rb.xml
+ ${PROJECT_SOURCE_DIR}/share/styles/cchords_sym.xml
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/styles
+ )
+endif (MSVC)
diff --git a/mtest/importmidi/tst_importmidi.cpp b/mtest/importmidi/tst_importmidi.cpp
index fe9d832467797..be55dbb864ef0 100644
--- a/mtest/importmidi/tst_importmidi.cpp
+++ b/mtest/importmidi/tst_importmidi.cpp
@@ -20,20 +20,20 @@
#include "libmscore/chord.h"
#include "libmscore/note.h"
#include "libmscore/keysig.h"
-#include "mscore/exportmidi.h"
+#include "audio/exports/exportmidi.h"
#include "libmscore/mcursor.h"
#include "mtest/testutils.h"
#include "inner_func_decl.h"
-#include "mscore/importmidi/importmidi_chord.h"
-#include "mscore/importmidi/importmidi_tuplet.h"
-#include "mscore/importmidi/importmidi_meter.h"
-#include "mscore/importmidi/importmidi_inner.h"
-#include "mscore/importmidi/importmidi_quant.h"
-#include "mscore/importmidi/importmidi_fraction.h"
-#include "mscore/importmidi/importmidi_operations.h"
-#include "mscore/importmidi/importmidi_model.h"
-#include "mscore/importmidi/importmidi_lyrics.h"
+#include "importexport/midiimport/importmidi_chord.h"
+#include "importexport/midiimport/importmidi_tuplet.h"
+#include "importexport/midiimport/importmidi_meter.h"
+#include "importexport/midiimport/importmidi_inner.h"
+#include "importexport/midiimport/importmidi_quant.h"
+#include "importexport/midiimport/importmidi_fraction.h"
+#include "importexport/midiimport/importmidi_operations.h"
+#include "importexport/midiimport/importmidi_model.h"
+#include "importexport/midiimport/importmidi_lyrics.h"
#include "mscore/preferences.h"
diff --git a/mtest/libmscore/tuplet/tst_tuplet.cpp b/mtest/libmscore/tuplet/tst_tuplet.cpp
index e15c5ef0e2b44..41d6e335e8cc7 100644
--- a/mtest/libmscore/tuplet/tst_tuplet.cpp
+++ b/mtest/libmscore/tuplet/tst_tuplet.cpp
@@ -121,7 +121,7 @@ void TestTuplet::tuplet(const char* p1, const char* p2)
Segment* s = m2->first(SegmentType::ChordRest);
QVERIFY(s != 0);
- Chord* c = toChord(s->element(0));
+ Ms::Chord* c = toChord(s->element(0));
QVERIFY(c != 0);
QVERIFY(createTuplet(3, c));
diff --git a/mtest/mscore/workspaces/CMakeLists.txt b/mtest/mscore/workspaces/CMakeLists.txt
index 948c30ed9d909..ce61a0185b2a7 100644
--- a/mtest/mscore/workspaces/CMakeLists.txt
+++ b/mtest/mscore/workspaces/CMakeLists.txt
@@ -22,3 +22,11 @@ set(TARGET tst_workspaces)
set(MTEST_LINK_MSCOREAPP TRUE)
include(${PROJECT_SOURCE_DIR}/mtest/cmake.inc)
+
+if (MSVC)
+ install(DIRECTORY
+ ${CMAKE_INSTALL_PREFIX}/workspaces
+ USE_SOURCE_PERMISSIONS
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+ )
+endif (MSVC)
diff --git a/mtest/mscore/workspaces/tst_workspaces.cpp b/mtest/mscore/workspaces/tst_workspaces.cpp
index ef3377b74862f..2b1784cc07c1f 100644
--- a/mtest/mscore/workspaces/tst_workspaces.cpp
+++ b/mtest/mscore/workspaces/tst_workspaces.cpp
@@ -79,6 +79,8 @@ void TestWorkspaces::initTestCase()
{
qputenv("QML_DISABLE_DISK_CACHE", "true");
qSetMessagePattern("%{function}: %{message}");
+ // Force INI settings format to store settings in a temporary directory
+ QSettings::setDefaultFormat(QSettings::IniFormat);
MScore::noGui = true;
MScore::testMode = true;
initMuseScoreResources();
@@ -90,7 +92,7 @@ void TestWorkspaces::initTestCase()
void TestWorkspaces::initMuseScore()
{
- Ms::dataPath = tmpDataDir->path();
+ MuseScoreApplication::setCustomConfigFolder(tmpDataDir->path());
QStringList temp;
MuseScore::init(temp);
WorkspacesManager::initCurrentWorkspace();
diff --git a/mtest/mtestglobals.cpp b/mtest/mtestglobals.cpp
index 233cc178bfa87..7d4357634cb7b 100644
--- a/mtest/mtestglobals.cpp
+++ b/mtest/mtestglobals.cpp
@@ -34,7 +34,7 @@ QString revision;
MasterSynthesizer* synti;
QString dataPath;
-QIcon* icons[0];
+QIcon* icons[1];
QString mscoreGlobalShare;
}
diff --git a/mtest/scripting/CMakeLists.txt b/mtest/scripting/CMakeLists.txt
index fb6e6be89e923..078f45e124216 100644
--- a/mtest/scripting/CMakeLists.txt
+++ b/mtest/scripting/CMakeLists.txt
@@ -15,3 +15,15 @@ set(TARGET tst_scripting)
set(MTEST_LINK_MSCOREAPP TRUE)
include(${PROJECT_SOURCE_DIR}/mtest/cmake.inc)
+
+if (MSVC)
+ install(DIRECTORY
+ ${QT_INSTALL_QML}
+ DESTINATION ${CMAKE_CURRENT_BINARY_DIR}
+ REGEX ".*d\\.dll" EXCLUDE
+ REGEX ".*QtMultimedia.*" EXCLUDE
+ REGEX ".*QtSensors.*" EXCLUDE
+ REGEX ".*QtTest.*" EXCLUDE
+ REGEX ".*QtWebkit.*" EXCLUDE
+ )
+endif (MSVC)
diff --git a/mtest/testscript/scripts/#120271-parts-spanners-elongation.mscx b/mtest/testscript/scripts/#120271-parts-spanners-elongation.mscx
index bbf815398a919..df9aec2a9579c 100644
--- a/mtest/testscript/scripts/#120271-parts-spanners-elongation.mscx
+++ b/mtest/testscript/scripts/#120271-parts-spanners-elongation.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/#173381-mmrest-copy.mscx b/mtest/testscript/scripts/#173381-mmrest-copy.mscx
index 3edd29deacacd..b399db6193617 100644
--- a/mtest/testscript/scripts/#173381-mmrest-copy.mscx
+++ b/mtest/testscript/scripts/#173381-mmrest-copy.mscx
@@ -27,7 +27,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/#173381-mmrest-repeat-1.mscx b/mtest/testscript/scripts/#173381-mmrest-repeat-1.mscx
index 35eda9e545591..9f44d8762d5d8 100644
--- a/mtest/testscript/scripts/#173381-mmrest-repeat-1.mscx
+++ b/mtest/testscript/scripts/#173381-mmrest-repeat-1.mscx
@@ -27,7 +27,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/#173381-mmrest-repeat-2.mscx b/mtest/testscript/scripts/#173381-mmrest-repeat-2.mscx
index f972b780d2951..3c102d92284d4 100644
--- a/mtest/testscript/scripts/#173381-mmrest-repeat-2.mscx
+++ b/mtest/testscript/scripts/#173381-mmrest-repeat-2.mscx
@@ -27,7 +27,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/#280574-ctrl-del-corruption.mscx b/mtest/testscript/scripts/#280574-ctrl-del-corruption.mscx
index 76cfdb90f1d98..f9a933de1e925 100644
--- a/mtest/testscript/scripts/#280574-ctrl-del-corruption.mscx
+++ b/mtest/testscript/scripts/#280574-ctrl-del-corruption.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/#293318-paste-grace.mscx b/mtest/testscript/scripts/#293318-paste-grace.mscx
index af4b68ef6aa83..843c269735bd1 100644
--- a/mtest/testscript/scripts/#293318-paste-grace.mscx
+++ b/mtest/testscript/scripts/#293318-paste-grace.mscx
@@ -22,7 +22,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/#294727-navigate-voice-4.mscx b/mtest/testscript/scripts/#294727-navigate-voice-4.mscx
index ebcd14912c884..3c88547cf7411 100644
--- a/mtest/testscript/scripts/#294727-navigate-voice-4.mscx
+++ b/mtest/testscript/scripts/#294727-navigate-voice-4.mscx
@@ -21,7 +21,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/#295107-last-finger-crash.mscx b/mtest/testscript/scripts/#295107-last-finger-crash.mscx
index 83b1c472757d8..40141d960827b 100644
--- a/mtest/testscript/scripts/#295107-last-finger-crash.mscx
+++ b/mtest/testscript/scripts/#295107-last-finger-crash.mscx
@@ -22,7 +22,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/#295357-lyric-offset-part.mscx b/mtest/testscript/scripts/#295357-lyric-offset-part.mscx
index af17ac7570dfe..ab8845d72151b 100644
--- a/mtest/testscript/scripts/#295357-lyric-offset-part.mscx
+++ b/mtest/testscript/scripts/#295357-lyric-offset-part.mscx
@@ -24,7 +24,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/#296053-start-note-input.mscx b/mtest/testscript/scripts/#296053-start-note-input.mscx
index d6b709b26da00..ca4d324a49846 100644
--- a/mtest/testscript/scripts/#296053-start-note-input.mscx
+++ b/mtest/testscript/scripts/#296053-start-note-input.mscx
@@ -22,7 +22,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/283943-delete-measure-at-glissando-end.mscx b/mtest/testscript/scripts/283943-delete-measure-at-glissando-end.mscx
index 99afcaeffabae..9bdd428b3ed93 100644
--- a/mtest/testscript/scripts/283943-delete-measure-at-glissando-end.mscx
+++ b/mtest/testscript/scripts/283943-delete-measure-at-glissando-end.mscx
@@ -24,7 +24,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/290096-remove-beat-parts-corruption.mscx b/mtest/testscript/scripts/290096-remove-beat-parts-corruption.mscx
index 8bc4277be14d9..7542caed11c44 100644
--- a/mtest/testscript/scripts/290096-remove-beat-parts-corruption.mscx
+++ b/mtest/testscript/scripts/290096-remove-beat-parts-corruption.mscx
@@ -24,7 +24,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/301436-navigate-mmrest.mscx b/mtest/testscript/scripts/301436-navigate-mmrest.mscx
index 9f969451cd7d5..91fa8f5dfb256 100644
--- a/mtest/testscript/scripts/301436-navigate-mmrest.mscx
+++ b/mtest/testscript/scripts/301436-navigate-mmrest.mscx
@@ -29,6 +29,7 @@
+
diff --git a/mtest/testscript/scripts/301496-navigate-volta.mscx b/mtest/testscript/scripts/301496-navigate-volta.mscx
index 763c4c73cadf6..3256d93ee2cf3 100644
--- a/mtest/testscript/scripts/301496-navigate-volta.mscx
+++ b/mtest/testscript/scripts/301496-navigate-volta.mscx
@@ -22,6 +22,7 @@
+
diff --git a/mtest/testscript/scripts/accessible1.mscx b/mtest/testscript/scripts/accessible1.mscx
index 6ffa3ce81f00d..cc329a373c77a 100644
--- a/mtest/testscript/scripts/accessible1.mscx
+++ b/mtest/testscript/scripts/accessible1.mscx
@@ -17,6 +17,7 @@
+
diff --git a/mtest/testscript/scripts/accessible2.mscx b/mtest/testscript/scripts/accessible2.mscx
index 8d87c93a27c94..57ddeab7833db 100644
--- a/mtest/testscript/scripts/accessible2.mscx
+++ b/mtest/testscript/scripts/accessible2.mscx
@@ -21,6 +21,7 @@
+
diff --git a/mtest/testscript/scripts/basic_note_input.mscx b/mtest/testscript/scripts/basic_note_input.mscx
index e293c445800ca..329b86cd7ebf1 100644
--- a/mtest/testscript/scripts/basic_note_input.mscx
+++ b/mtest/testscript/scripts/basic_note_input.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/excerptchange.mscx b/mtest/testscript/scripts/excerptchange.mscx
index 0abc104fd3361..3be7a2483a5ac 100644
--- a/mtest/testscript/scripts/excerptchange.mscx
+++ b/mtest/testscript/scripts/excerptchange.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/exchange-voice-part.mscx b/mtest/testscript/scripts/exchange-voice-part.mscx
index 4acdb421c55ac..6e7504a91c1a3 100644
--- a/mtest/testscript/scripts/exchange-voice-part.mscx
+++ b/mtest/testscript/scripts/exchange-voice-part.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/exchange-voice-part~undo.mscx b/mtest/testscript/scripts/exchange-voice-part~undo.mscx
index 6299ed413fb95..562a10dc257c7 100644
--- a/mtest/testscript/scripts/exchange-voice-part~undo.mscx
+++ b/mtest/testscript/scripts/exchange-voice-part~undo.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/init/Guitar-tab-parts.mscx b/mtest/testscript/scripts/init/Guitar-tab-parts.mscx
index e0b077d7ef3d7..90e4834b470d5 100644
--- a/mtest/testscript/scripts/init/Guitar-tab-parts.mscx
+++ b/mtest/testscript/scripts/init/Guitar-tab-parts.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/init/Treble.mscx b/mtest/testscript/scripts/init/Treble.mscx
index f5cf6af443ae3..0ad08c87af618 100644
--- a/mtest/testscript/scripts/init/Treble.mscx
+++ b/mtest/testscript/scripts/init/Treble.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/init/TrebleWithPart-Lyrics.mscx b/mtest/testscript/scripts/init/TrebleWithPart-Lyrics.mscx
index 35a7b2de29178..5623d38ac691c 100644
--- a/mtest/testscript/scripts/init/TrebleWithPart-Lyrics.mscx
+++ b/mtest/testscript/scripts/init/TrebleWithPart-Lyrics.mscx
@@ -24,7 +24,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/init/TrebleWithPart.mscx b/mtest/testscript/scripts/init/TrebleWithPart.mscx
index a105671866aef..e1f081c16e3da 100644
--- a/mtest/testscript/scripts/init/TrebleWithPart.mscx
+++ b/mtest/testscript/scripts/init/TrebleWithPart.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/init/Voice-Piano-3-4.mscx b/mtest/testscript/scripts/init/Voice-Piano-3-4.mscx
index 9e86fe363cd20..60c21daee5bf1 100644
--- a/mtest/testscript/scripts/init/Voice-Piano-3-4.mscx
+++ b/mtest/testscript/scripts/init/Voice-Piano-3-4.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/init/oneStaffWithNotesAndMM.mscx b/mtest/testscript/scripts/init/oneStaffWithNotesAndMM.mscx
index 013eda4fbe034..e15ad7f3ece09 100644
--- a/mtest/testscript/scripts/init/oneStaffWithNotesAndMM.mscx
+++ b/mtest/testscript/scripts/init/oneStaffWithNotesAndMM.mscx
@@ -33,7 +33,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/init/twoStavesWithNotesAndMore.mscx b/mtest/testscript/scripts/init/twoStavesWithNotesAndMore.mscx
index 33e82ffbac1ad..42922cff17c52 100644
--- a/mtest/testscript/scripts/init/twoStavesWithNotesAndMore.mscx
+++ b/mtest/testscript/scripts/init/twoStavesWithNotesAndMore.mscx
@@ -17,6 +17,7 @@
+
diff --git a/mtest/testscript/scripts/inspector.mscx b/mtest/testscript/scripts/inspector.mscx
index e79abd673d1bc..e97699d3a4177 100644
--- a/mtest/testscript/scripts/inspector.mscx
+++ b/mtest/testscript/scripts/inspector.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/mindistance1.mscx b/mtest/testscript/scripts/mindistance1.mscx
index bb4d4c056f0fe..6e8b2efd56c32 100644
--- a/mtest/testscript/scripts/mindistance1.mscx
+++ b/mtest/testscript/scripts/mindistance1.mscx
@@ -22,6 +22,7 @@
+
diff --git a/mtest/testscript/scripts/note_input_arrows.mscx b/mtest/testscript/scripts/note_input_arrows.mscx
index 246e34542e490..a115c9bbd0a23 100644
--- a/mtest/testscript/scripts/note_input_arrows.mscx
+++ b/mtest/testscript/scripts/note_input_arrows.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_aug_dots.mscx b/mtest/testscript/scripts/note_input_aug_dots.mscx
index e2d5a76a1293d..9771788c914fe 100644
--- a/mtest/testscript/scripts/note_input_aug_dots.mscx
+++ b/mtest/testscript/scripts/note_input_aug_dots.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_different.mscx b/mtest/testscript/scripts/note_input_different.mscx
index a59f8181cd6de..213b1eda8e806 100644
--- a/mtest/testscript/scripts/note_input_different.mscx
+++ b/mtest/testscript/scripts/note_input_different.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_flip.mscx b/mtest/testscript/scripts/note_input_flip.mscx
index d549f2b1243e6..d549369c2b448 100644
--- a/mtest/testscript/scripts/note_input_flip.mscx
+++ b/mtest/testscript/scripts/note_input_flip.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_flip_even_odd.mscx b/mtest/testscript/scripts/note_input_flip_even_odd.mscx
index 253e2f5d1e9b0..0b870e25e986f 100644
--- a/mtest/testscript/scripts/note_input_flip_even_odd.mscx
+++ b/mtest/testscript/scripts/note_input_flip_even_odd.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_quarter.mscx b/mtest/testscript/scripts/note_input_quarter.mscx
index 1707bdcf89204..e3ba9f7492eff 100644
--- a/mtest/testscript/scripts/note_input_quarter.mscx
+++ b/mtest/testscript/scripts/note_input_quarter.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_rests.mscx b/mtest/testscript/scripts/note_input_rests.mscx
index 8690901980957..fb3715e633b7d 100644
--- a/mtest/testscript/scripts/note_input_rests.mscx
+++ b/mtest/testscript/scripts/note_input_rests.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_select_undo.mscx b/mtest/testscript/scripts/note_input_select_undo.mscx
index d065b064c615d..18f2b3637d23b 100644
--- a/mtest/testscript/scripts/note_input_select_undo.mscx
+++ b/mtest/testscript/scripts/note_input_select_undo.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_slurs.mscx b/mtest/testscript/scripts/note_input_slurs.mscx
index 422a76e285e8d..a101aee035a41 100644
--- a/mtest/testscript/scripts/note_input_slurs.mscx
+++ b/mtest/testscript/scripts/note_input_slurs.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_tie.mscx b/mtest/testscript/scripts/note_input_tie.mscx
index 1650eb22b0be0..c53f5f724f2a1 100644
--- a/mtest/testscript/scripts/note_input_tie.mscx
+++ b/mtest/testscript/scripts/note_input_tie.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/note_input_voices.mscx b/mtest/testscript/scripts/note_input_voices.mscx
index 796faac1444ad..99c05f1434cbb 100644
--- a/mtest/testscript/scripts/note_input_voices.mscx
+++ b/mtest/testscript/scripts/note_input_voices.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette.mscx b/mtest/testscript/scripts/palette.mscx
index 93107a356a185..a863617c6c278 100644
--- a/mtest/testscript/scripts/palette.mscx
+++ b/mtest/testscript/scripts/palette.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_accidentals_1.mscx b/mtest/testscript/scripts/palette_accidentals_1.mscx
index 8e9ecdcc74e39..f3f4aff955c9c 100644
--- a/mtest/testscript/scripts/palette_accidentals_1.mscx
+++ b/mtest/testscript/scripts/palette_accidentals_1.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_arpeggio_gliss_1.mscx b/mtest/testscript/scripts/palette_arpeggio_gliss_1.mscx
index 54e8706b9560e..31d4654442826 100644
--- a/mtest/testscript/scripts/palette_arpeggio_gliss_1.mscx
+++ b/mtest/testscript/scripts/palette_arpeggio_gliss_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_articulations_1.mscx b/mtest/testscript/scripts/palette_articulations_1.mscx
index 4f8fa19c7d948..4b5e7db000d89 100644
--- a/mtest/testscript/scripts/palette_articulations_1.mscx
+++ b/mtest/testscript/scripts/palette_articulations_1.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_articulations_2.mscx b/mtest/testscript/scripts/palette_articulations_2.mscx
index 28d7ec4faa143..00d84977bb012 100644
--- a/mtest/testscript/scripts/palette_articulations_2.mscx
+++ b/mtest/testscript/scripts/palette_articulations_2.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_barlines_1.mscx b/mtest/testscript/scripts/palette_barlines_1.mscx
index a0fc5a68b9510..3fb0efe51bc6c 100644
--- a/mtest/testscript/scripts/palette_barlines_1.mscx
+++ b/mtest/testscript/scripts/palette_barlines_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_beams_1.mscx b/mtest/testscript/scripts/palette_beams_1.mscx
index 37dc3c50eaec5..72731d2e93511 100644
--- a/mtest/testscript/scripts/palette_beams_1.mscx
+++ b/mtest/testscript/scripts/palette_beams_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_breaks_1.mscx b/mtest/testscript/scripts/palette_breaks_1.mscx
index aa697d7a4953b..0eb8a2aaf3a0e 100644
--- a/mtest/testscript/scripts/palette_breaks_1.mscx
+++ b/mtest/testscript/scripts/palette_breaks_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_breath_and_pause_1.mscx b/mtest/testscript/scripts/palette_breath_and_pause_1.mscx
index 93150342f4f7d..25562af6c2429 100644
--- a/mtest/testscript/scripts/palette_breath_and_pause_1.mscx
+++ b/mtest/testscript/scripts/palette_breath_and_pause_1.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_clefs_1.mscx b/mtest/testscript/scripts/palette_clefs_1.mscx
index 2c625f33dcdd4..367f5d85d0592 100644
--- a/mtest/testscript/scripts/palette_clefs_1.mscx
+++ b/mtest/testscript/scripts/palette_clefs_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_clefs_2.mscx b/mtest/testscript/scripts/palette_clefs_2.mscx
index 44a5de12d7193..ef0dde70751f9 100644
--- a/mtest/testscript/scripts/palette_clefs_2.mscx
+++ b/mtest/testscript/scripts/palette_clefs_2.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_grace_notes_1.mscx b/mtest/testscript/scripts/palette_grace_notes_1.mscx
index 635d48b9156f2..35df425425549 100644
--- a/mtest/testscript/scripts/palette_grace_notes_1.mscx
+++ b/mtest/testscript/scripts/palette_grace_notes_1.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_gracenotes_1.mscx b/mtest/testscript/scripts/palette_gracenotes_1.mscx
index 909206bc87d23..650d0d19a43f4 100644
--- a/mtest/testscript/scripts/palette_gracenotes_1.mscx
+++ b/mtest/testscript/scripts/palette_gracenotes_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_gracenotes_2.mscx b/mtest/testscript/scripts/palette_gracenotes_2.mscx
index 9f30ed3e66085..9f11a91e1e4d6 100644
--- a/mtest/testscript/scripts/palette_gracenotes_2.mscx
+++ b/mtest/testscript/scripts/palette_gracenotes_2.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_keysigs_1.mscx b/mtest/testscript/scripts/palette_keysigs_1.mscx
index 4f8103735e012..d78070626afb1 100644
--- a/mtest/testscript/scripts/palette_keysigs_1.mscx
+++ b/mtest/testscript/scripts/palette_keysigs_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_keysigs_2.mscx b/mtest/testscript/scripts/palette_keysigs_2.mscx
index c7c7915371822..d9118d3c4ffa2 100644
--- a/mtest/testscript/scripts/palette_keysigs_2.mscx
+++ b/mtest/testscript/scripts/palette_keysigs_2.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_keysigs_3.mscx b/mtest/testscript/scripts/palette_keysigs_3.mscx
index 3cc75d8270cf1..2addc9a8da2ce 100644
--- a/mtest/testscript/scripts/palette_keysigs_3.mscx
+++ b/mtest/testscript/scripts/palette_keysigs_3.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_lines_1.mscx b/mtest/testscript/scripts/palette_lines_1.mscx
index 88f50f98184db..ac3befe64e016 100644
--- a/mtest/testscript/scripts/palette_lines_1.mscx
+++ b/mtest/testscript/scripts/palette_lines_1.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_noteheads_1.mscx b/mtest/testscript/scripts/palette_noteheads_1.mscx
index 33ad08defcd96..6faf06e51cbbf 100644
--- a/mtest/testscript/scripts/palette_noteheads_1.mscx
+++ b/mtest/testscript/scripts/palette_noteheads_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_ornaments_1.mscx b/mtest/testscript/scripts/palette_ornaments_1.mscx
index 72a7dce0a623b..240ebebfc59c6 100644
--- a/mtest/testscript/scripts/palette_ornaments_1.mscx
+++ b/mtest/testscript/scripts/palette_ornaments_1.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_timesigs_1.mscx b/mtest/testscript/scripts/palette_timesigs_1.mscx
index dafee155455a6..810c2bf1bf0ce 100644
--- a/mtest/testscript/scripts/palette_timesigs_1.mscx
+++ b/mtest/testscript/scripts/palette_timesigs_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/palette_tremolo_1.mscx b/mtest/testscript/scripts/palette_tremolo_1.mscx
index da44f142e8ba1..b55901202993e 100644
--- a/mtest/testscript/scripts/palette_tremolo_1.mscx
+++ b/mtest/testscript/scripts/palette_tremolo_1.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/paste_excceed_scoreLen_MMrest.mscx b/mtest/testscript/scripts/paste_excceed_scoreLen_MMrest.mscx
index 038f793afe35d..88e39aecc5b69 100644
--- a/mtest/testscript/scripts/paste_excceed_scoreLen_MMrest.mscx
+++ b/mtest/testscript/scripts/paste_excceed_scoreLen_MMrest.mscx
@@ -33,7 +33,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/repeat-sel-end-score.mscx b/mtest/testscript/scripts/repeat-sel-end-score.mscx
index 55caf27bf5553..05531cc496c5c 100644
--- a/mtest/testscript/scripts/repeat-sel-end-score.mscx
+++ b/mtest/testscript/scripts/repeat-sel-end-score.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/timewise-input.mscx b/mtest/testscript/scripts/timewise-input.mscx
index 5ab36e244c138..1175b9c8aca75 100644
--- a/mtest/testscript/scripts/timewise-input.mscx
+++ b/mtest/testscript/scripts/timewise-input.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/ux_replace_slurs_on_copy.mscx b/mtest/testscript/scripts/ux_replace_slurs_on_copy.mscx
index 542b9d673d528..f1873463b3275 100644
--- a/mtest/testscript/scripts/ux_replace_slurs_on_copy.mscx
+++ b/mtest/testscript/scripts/ux_replace_slurs_on_copy.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/ux_replace_slurs_on_copy_diffstaves.mscx b/mtest/testscript/scripts/ux_replace_slurs_on_copy_diffstaves.mscx
index a9e51a126adab..80b4148284fc9 100644
--- a/mtest/testscript/scripts/ux_replace_slurs_on_copy_diffstaves.mscx
+++ b/mtest/testscript/scripts/ux_replace_slurs_on_copy_diffstaves.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/ux_replace_slurs_on_copy_diffstaves~undo.mscx b/mtest/testscript/scripts/ux_replace_slurs_on_copy_diffstaves~undo.mscx
index b4ee1b840dd5d..4c19fbca08e1e 100644
--- a/mtest/testscript/scripts/ux_replace_slurs_on_copy_diffstaves~undo.mscx
+++ b/mtest/testscript/scripts/ux_replace_slurs_on_copy_diffstaves~undo.mscx
@@ -25,7 +25,7 @@
- Linux
+
diff --git a/mtest/testscript/scripts/ux_replace_slurs_on_copy~undo.mscx b/mtest/testscript/scripts/ux_replace_slurs_on_copy~undo.mscx
index 849f5d5a597a1..ef908a4e95f60 100644
--- a/mtest/testscript/scripts/ux_replace_slurs_on_copy~undo.mscx
+++ b/mtest/testscript/scripts/ux_replace_slurs_on_copy~undo.mscx
@@ -26,7 +26,7 @@
- Linux
+
diff --git a/mtest/zerberus/comments/CMakeLists.txt b/mtest/zerberus/comments/CMakeLists.txt
index 2e4956d36ad92..095c191a420a9 100644
--- a/mtest/zerberus/comments/CMakeLists.txt
+++ b/mtest/zerberus/comments/CMakeLists.txt
@@ -18,4 +18,8 @@ include_directories(
${SNDFILE_INCDIR}
)
-target_link_libraries(tst_sfzcomments audio audiofile ${SNDFILE_LIB} testutils)
+if (MSVC OR MINGW)
+ target_link_libraries(tst_sfzcomments audio audiofile sndfiledll testutils)
+else (MSVC OR MINGW)
+ target_link_libraries(tst_sfzcomments audio audiofile ${SNDFILE_LIB} testutils)
+endif (MSVC OR MINGW)
diff --git a/mtest/zerberus/envelopes/CMakeLists.txt b/mtest/zerberus/envelopes/CMakeLists.txt
index 3fa649555db5c..ba87caa9e63e5 100644
--- a/mtest/zerberus/envelopes/CMakeLists.txt
+++ b/mtest/zerberus/envelopes/CMakeLists.txt
@@ -18,4 +18,8 @@ include_directories(
${SNDFILE_INCDIR}
)
-target_link_libraries(tst_sfzenvelopes audio audiofile ${SNDFILE_LIB} testutils)
+if (MSVC OR MINGW)
+ target_link_libraries(tst_sfzenvelopes audio audiofile sndfiledll testutils)
+else (MSVC OR MINGW)
+ target_link_libraries(tst_sfzenvelopes audio audiofile ${SNDFILE_LIB} testutils)
+endif (MSVC OR MINGW)
diff --git a/mtest/zerberus/global/CMakeLists.txt b/mtest/zerberus/global/CMakeLists.txt
index 1e8a1279e2ee5..0b23d1e75ed36 100644
--- a/mtest/zerberus/global/CMakeLists.txt
+++ b/mtest/zerberus/global/CMakeLists.txt
@@ -18,4 +18,8 @@ include_directories(
${SNDFILE_INCDIR}
)
-target_link_libraries(tst_sfzglobal audio audiofile ${SNDFILE_LIB} testutils)
+if (MSVC OR MINGW)
+ target_link_libraries(tst_sfzglobal audio audiofile sndfiledll testutils)
+else (MSVC OR MINGW)
+ target_link_libraries(tst_sfzglobal audio audiofile ${SNDFILE_LIB} testutils)
+endif (MSVC OR MINGW)
diff --git a/mtest/zerberus/includes/CMakeLists.txt b/mtest/zerberus/includes/CMakeLists.txt
index c20b417d335c0..810791034435d 100644
--- a/mtest/zerberus/includes/CMakeLists.txt
+++ b/mtest/zerberus/includes/CMakeLists.txt
@@ -18,4 +18,8 @@ include_directories(
${SNDFILE_INCDIR}
)
-target_link_libraries(tst_sfzincludes audio audiofile ${SNDFILE_LIB} testutils)
+if (MSVC OR MINGW)
+ target_link_libraries(tst_sfzincludes audio audiofile sndfiledll testutils)
+else (MSVC OR MINGW)
+ target_link_libraries(tst_sfzincludes audio audiofile ${SNDFILE_LIB} testutils)
+endif (MSVC OR MINGW)
diff --git a/mtest/zerberus/inputControls/CMakeLists.txt b/mtest/zerberus/inputControls/CMakeLists.txt
index 19994ebbd6688..b4fb7291b1198 100644
--- a/mtest/zerberus/inputControls/CMakeLists.txt
+++ b/mtest/zerberus/inputControls/CMakeLists.txt
@@ -18,4 +18,8 @@ include_directories(
${SNDFILE_INCDIR}
)
-target_link_libraries(tst_sfzinputcontrols audio audiofile ${SNDFILE_LIB} testutils)
+if (MSVC OR MINGW)
+ target_link_libraries(tst_sfzinputcontrols audio audiofile sndfiledll testutils)
+else (MSVC OR MINGW)
+ target_link_libraries(tst_sfzinputcontrols audio audiofile ${SNDFILE_LIB} testutils)
+endif (MSVC OR MINGW)
diff --git a/mtest/zerberus/loop/CMakeLists.txt b/mtest/zerberus/loop/CMakeLists.txt
index dc5a02581b1da..f4855bb64b341 100644
--- a/mtest/zerberus/loop/CMakeLists.txt
+++ b/mtest/zerberus/loop/CMakeLists.txt
@@ -18,4 +18,8 @@ include_directories(
${SNDFILE_INCDIR}
)
-target_link_libraries(tst_sfzloop audio audiofile ${SNDFILE_LIB} testutils)
+if (MSVC OR MINGW)
+ target_link_libraries(tst_sfzloop audio audiofile sndfiledll testutils)
+else (MSVC OR MINGW)
+ target_link_libraries(tst_sfzloop audio audiofile ${SNDFILE_LIB} testutils)
+endif (MSVC OR MINGW)
diff --git a/mtest/zerberus/opcodeparse/CMakeLists.txt b/mtest/zerberus/opcodeparse/CMakeLists.txt
index b61065f99e55d..1dccd67166405 100644
--- a/mtest/zerberus/opcodeparse/CMakeLists.txt
+++ b/mtest/zerberus/opcodeparse/CMakeLists.txt
@@ -18,4 +18,8 @@ include_directories(
${SNDFILE_INCDIR}
)
-target_link_libraries(tst_sfzopcodes audio audiofile ${SNDFILE_LIB} testutils)
+if (MSVC OR MINGW)
+ target_link_libraries(tst_sfzopcodes audio audiofile sndfiledll testutils)
+else (MSVC OR MINGW)
+ target_link_libraries(tst_sfzopcodes audio audiofile ${SNDFILE_LIB} testutils)
+endif (MSVC OR MINGW)