Index: build/premake/mpt-OpenMPT.lua =================================================================== --- build/premake/mpt-OpenMPT.lua (revision 11462) +++ build/premake/mpt-OpenMPT.lua (working copy) @@ -159,23 +159,7 @@ "soundtouch", "vorbis", } - filter { "configurations:*Shared" } - filter { "not configurations:*Shared" } - linkoptions { - "/DELAYLOAD:openmpt-lame.dll", - "/DELAYLOAD:openmpt-mpg123.dll", - "/DELAYLOAD:openmpt-soundtouch.dll", - } filter {} - if not _OPTIONS["xp"] then - linkoptions { - "/DELAYLOAD:mf.dll", - "/DELAYLOAD:mfplat.dll", - "/DELAYLOAD:mfreadwrite.dll", --- "/DELAYLOAD:mfuuid.dll", -- static library - "/DELAYLOAD:propsys.dll", - } - end filter { "action:vs*" } files { "../../build/vs/debug/openmpt.natvis", Index: build/vs2015win7/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2015win7/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2015win7/OpenMPT-ANSI.vcxproj (working copy) @@ -290,7 +290,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -321,7 +320,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -361,7 +359,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -400,7 +397,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -440,7 +436,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -479,7 +474,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -512,7 +506,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -545,7 +538,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -585,7 +577,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -624,7 +615,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -664,7 +654,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -703,7 +692,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false Index: build/vs2015win7/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2015win7/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2015win7/OpenMPT-UTF8.vcxproj (working copy) @@ -290,7 +290,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -321,7 +320,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -361,7 +359,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -400,7 +397,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -440,7 +436,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -479,7 +474,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -512,7 +506,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -545,7 +538,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -585,7 +577,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -624,7 +615,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -664,7 +654,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -703,7 +692,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false Index: build/vs2015win7/OpenMPT.vcxproj =================================================================== --- build/vs2015win7/OpenMPT.vcxproj (revision 11462) +++ build/vs2015win7/OpenMPT.vcxproj (working copy) @@ -290,7 +290,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -321,7 +320,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -361,7 +359,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -400,7 +397,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -440,7 +436,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -479,7 +474,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -512,7 +506,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -545,7 +538,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -585,7 +577,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -624,7 +615,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -664,7 +654,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -703,7 +692,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false Index: build/vs2015winxp/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2015winxp/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2015winxp/OpenMPT-ANSI.vcxproj (working copy) @@ -292,7 +292,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -324,7 +323,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -365,7 +363,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -405,7 +402,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -446,7 +442,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -486,7 +481,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false Index: build/vs2015winxp/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2015winxp/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2015winxp/OpenMPT-UTF8.vcxproj (working copy) @@ -292,7 +292,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -324,7 +323,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -365,7 +363,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -405,7 +402,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -446,7 +442,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -486,7 +481,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false Index: build/vs2015winxp/OpenMPT.vcxproj =================================================================== --- build/vs2015winxp/OpenMPT.vcxproj (revision 11462) +++ build/vs2015winxp/OpenMPT.vcxproj (working copy) @@ -292,7 +292,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -324,7 +323,6 @@ Windows true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -365,7 +363,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -405,7 +402,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -446,7 +442,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -486,7 +481,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false Index: build/vs2017win10/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2017win10/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2017win10/OpenMPT-ANSI.vcxproj (working copy) @@ -562,7 +562,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -596,7 +595,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -630,7 +628,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -664,7 +661,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -706,7 +702,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -747,7 +742,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -788,7 +782,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -829,7 +822,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -871,7 +863,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -912,7 +903,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -953,7 +943,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -994,7 +983,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1029,7 +1017,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1064,7 +1051,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1099,7 +1085,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1134,7 +1119,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1176,7 +1160,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1217,7 +1200,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1258,7 +1240,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1299,7 +1280,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1341,7 +1321,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1382,7 +1361,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1423,7 +1401,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1464,7 +1441,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false Index: build/vs2017win10/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2017win10/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2017win10/OpenMPT-UTF8.vcxproj (working copy) @@ -562,7 +562,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -596,7 +595,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -630,7 +628,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -664,7 +661,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -706,7 +702,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -747,7 +742,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -788,7 +782,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -829,7 +822,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -871,7 +863,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -912,7 +903,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -953,7 +943,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -994,7 +983,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1029,7 +1017,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1064,7 +1051,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1099,7 +1085,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1134,7 +1119,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1176,7 +1160,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1217,7 +1200,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1258,7 +1240,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1299,7 +1280,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1341,7 +1321,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1382,7 +1361,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1423,7 +1401,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1464,7 +1441,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false Index: build/vs2017win10/OpenMPT.vcxproj =================================================================== --- build/vs2017win10/OpenMPT.vcxproj (revision 11462) +++ build/vs2017win10/OpenMPT.vcxproj (working copy) @@ -562,7 +562,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -596,7 +595,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -630,7 +628,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -664,7 +661,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -706,7 +702,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -747,7 +742,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -788,7 +782,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -829,7 +822,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -871,7 +863,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -912,7 +903,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -953,7 +943,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -994,7 +983,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1029,7 +1017,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1064,7 +1051,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1099,7 +1085,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1134,7 +1119,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1176,7 +1160,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1217,7 +1200,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1258,7 +1240,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1299,7 +1280,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1341,7 +1321,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1382,7 +1361,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1423,7 +1401,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -1464,7 +1441,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false Index: build/vs2017win7/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2017win7/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2017win7/OpenMPT-ANSI.vcxproj (working copy) @@ -293,7 +293,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -327,7 +326,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -369,7 +367,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -410,7 +407,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -452,7 +448,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -493,7 +488,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -528,7 +522,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -563,7 +556,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -605,7 +597,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -646,7 +637,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -688,7 +678,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -729,7 +718,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false Index: build/vs2017win7/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2017win7/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2017win7/OpenMPT-UTF8.vcxproj (working copy) @@ -293,7 +293,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -327,7 +326,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -369,7 +367,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -410,7 +407,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -452,7 +448,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -493,7 +488,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -528,7 +522,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -563,7 +556,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -605,7 +597,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -646,7 +637,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -688,7 +678,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -729,7 +718,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false Index: build/vs2017win7/OpenMPT.vcxproj =================================================================== --- build/vs2017win7/OpenMPT.vcxproj (revision 11462) +++ build/vs2017win7/OpenMPT.vcxproj (working copy) @@ -293,7 +293,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -327,7 +326,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -369,7 +367,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -410,7 +407,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -452,7 +448,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -493,7 +488,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -528,7 +522,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -563,7 +556,6 @@ Windows true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -605,7 +597,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -646,7 +637,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -688,7 +678,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false @@ -729,7 +718,6 @@ true true true - /DELAYLOAD:mf.dll /DELAYLOAD:mfplat.dll /DELAYLOAD:mfreadwrite.dll /DELAYLOAD:propsys.dll %(AdditionalOptions) false Index: build/vs2017winxp/OpenMPT-ANSI.vcxproj =================================================================== --- build/vs2017winxp/OpenMPT-ANSI.vcxproj (revision 11462) +++ build/vs2017winxp/OpenMPT-ANSI.vcxproj (working copy) @@ -294,7 +294,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -328,7 +327,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -370,7 +368,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -411,7 +408,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -453,7 +449,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -494,7 +489,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false Index: build/vs2017winxp/OpenMPT-UTF8.vcxproj =================================================================== --- build/vs2017winxp/OpenMPT-UTF8.vcxproj (revision 11462) +++ build/vs2017winxp/OpenMPT-UTF8.vcxproj (working copy) @@ -294,7 +294,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -328,7 +327,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -370,7 +368,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -411,7 +408,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -453,7 +449,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -494,7 +489,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false Index: build/vs2017winxp/OpenMPT.vcxproj =================================================================== --- build/vs2017winxp/OpenMPT.vcxproj (revision 11462) +++ build/vs2017winxp/OpenMPT.vcxproj (working copy) @@ -294,7 +294,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -328,7 +327,6 @@ true DebugFastLink true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -370,7 +368,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -411,7 +408,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -453,7 +449,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false @@ -494,7 +489,6 @@ true true true - /DELAYLOAD:openmpt-lame.dll /DELAYLOAD:openmpt-mpg123.dll /DELAYLOAD:openmpt-soundtouch.dll %(AdditionalOptions) false Index: common/BuildSettings.h =================================================================== --- common/BuildSettings.h (revision 11462) +++ common/BuildSettings.h (working copy) @@ -503,14 +503,6 @@ #endif // arch #endif // ENABLE_ASM -#if defined(MPT_WITH_LAME) && defined(MPT_BUILD_MSVC) && defined(MPT_BUILD_MSVC_STATIC) && defined(MODPLUG_TRACKER) && !MPT_OS_WINDOWS_WINRT -#define MPT_ENABLE_LAME_DELAYLOAD -#endif - -#if defined(MPT_WITH_MPG123) && defined(MPT_BUILD_MSVC) && defined(MPT_BUILD_MSVC_STATIC) && defined(MODPLUG_TRACKER) && !MPT_OS_WINDOWS_WINRT -#define MPT_ENABLE_MPG123_DELAYLOAD -#endif - #if defined(ENABLE_TESTS) && defined(MODPLUG_NO_FILESAVE) #undef MODPLUG_NO_FILESAVE // tests recommend file saving #endif @@ -548,18 +540,6 @@ #define MPT_ENABLE_DYNBIND // Tracker requires dynamic library loading for export codecs #endif -#if defined(MPT_ENABLE_LAME_DELAYLOAD) && !defined(MPT_ENABLE_DYNBIND) -#define MPT_ENABLE_DYNBIND // static MSVC builds require dynbind to load delay-loaded DLLs -#endif - -#if defined(MPT_ENABLE_MPG123_DELAYLOAD) && !defined(MPT_ENABLE_DYNBIND) -#define MPT_ENABLE_DYNBIND // static MSVC builds require dynbind to load delay-loaded DLLs -#endif - -#if defined(MPT_WITH_MEDIAFOUNDATION) && !defined(MPT_ENABLE_DYNBIND) -#define MPT_ENABLE_DYNBIND // MediaFoundation needs dynamic loading in order to test availability of delay loaded libs -#endif - #if (defined(MPT_WITH_MPG123) || defined(MPT_WITH_MINIMP3)) && !defined(MPT_ENABLE_MP3_SAMPLES) #define MPT_ENABLE_MP3_SAMPLES #endif Index: mptrack/Ctrl_smp.cpp =================================================================== --- mptrack/Ctrl_smp.cpp (revision 11462) +++ mptrack/Ctrl_smp.cpp (working copy) @@ -35,7 +35,6 @@ #include "../soundbase/SampleFormatCopy.h" #include "FileDialog.h" #include "ProgressDialog.h" -#include "../common/ComponentManager.h" #include "../include/r8brain/CDSPResampler.h" #include "../soundlib/MixFuncTable.h" @@ -2109,37 +2108,6 @@ } -#ifdef MPT_BUILD_MSVC_SHARED - -class ComponentSoundTouch - : public ComponentBuiltin -{ - MPT_DECLARE_COMPONENT_MEMBERS -public: - ComponentSoundTouch() - : ComponentBuiltin() - { - } -}; -MPT_REGISTERED_COMPONENT(ComponentSoundTouch, "") - -#else - -class ComponentSoundTouch - : public ComponentBundledDLL -{ - MPT_DECLARE_COMPONENT_MEMBERS -public: - ComponentSoundTouch() - : ComponentBundledDLL(P_("openmpt-soundtouch")) - { - } -}; -MPT_REGISTERED_COMPONENT(ComponentSoundTouch, "") - -#endif - - enum TimeStretchPitchShiftResult { kUnknown, @@ -2198,19 +2166,10 @@ if(m_ratio < 0.5f) return kStretchTooShort; if(m_ratio > 2.0f) return kStretchTooLong; - // Check whether the DLL file exists. - ComponentHandle soundTouch; - if(!IsComponentAvailable(soundTouch)) - { - MsgBox(IDS_SOUNDTOUCH_LOADFAILURE); - return kAbort; - } - HANDLE handleSt = soundtouch_createInstance(); if(handleSt == NULL) { - MsgBox(IDS_SOUNDTOUCH_LOADFAILURE); - return kAbort; + MPT_EXCEPTION_THROW_OUT_OF_MEMORY(); } // Get number of channels & sample size Index: mptrack/mptrack.rc =================================================================== --- mptrack/mptrack.rc (revision 11462) +++ mptrack/mptrack.rc (working copy) @@ -2761,7 +2761,6 @@ STRINGTABLE BEGIN - IDS_SOUNDTOUCH_LOADFAILURE "Unable to load OpenMPT_soundtouch_f32.dll." IDS_ERR_FILEOPEN "Unable to open file." IDS_ERR_FILETYPE "Unsupported file type" IDS_ERR_SAVEINS "Unable to save instrument" Index: mptrack/MPTrackLink.cpp =================================================================== --- mptrack/MPTrackLink.cpp (revision 11462) +++ mptrack/MPTrackLink.cpp (working copy) @@ -16,7 +16,6 @@ #if defined(MPT_BUILD_MSVC) #if MPT_COMPILER_MSVC || MPT_COMPILER_CLANG -#pragma comment(lib, "delayimp.lib") #pragma comment(lib, "version.lib") #pragma comment(lib, "rpcrt4.lib") #pragma comment(lib, "shlwapi.lib") Index: mptrack/resource.h =================================================================== --- mptrack/resource.h (revision 11462) +++ mptrack/resource.h (working copy) @@ -41,7 +41,6 @@ #define IDS_UNABLE_TO_LOAD_KEYBINDINGS 212 #define IDS_CANT_OPEN_FILE_FOR_WRITING 213 #define IDS_PATTERN_CLEANUP_UNAVAILABLE 215 -#define IDS_SOUNDTOUCH_LOADFAILURE 230 #define IDS_ERR_FILEOPEN 234 #define IDS_ERR_FILETYPE 235 #define IDS_ERR_SAVEINS 236 Index: mptrack/StreamEncoderMP3.cpp =================================================================== --- mptrack/StreamEncoderMP3.cpp (revision 11462) +++ mptrack/StreamEncoderMP3.cpp (working copy) @@ -13,8 +13,6 @@ #include "StreamEncoder.h" #include "StreamEncoderMP3.h" -#include "../common/ComponentManager.h" - #include "Mptrack.h" #include "../soundlib/Sndfile.h" @@ -350,42 +348,6 @@ typedef lame_global_flags *lame_t; -class ComponentLame -#if defined(MPT_ENABLE_LAME_DELAYLOAD) - : public ComponentBundledDLL -#else - : public ComponentBuiltin -#endif -{ - MPT_DECLARE_COMPONENT_MEMBERS - -public: - ComponentLame() -#if defined(MPT_ENABLE_LAME_DELAYLOAD) - : ComponentBundledDLL(P_("openmpt-lame")) -#else - : ComponentBuiltin() -#endif - { - return; - } - bool DoInitialize() override - { -#if defined(MPT_ENABLE_LAME_DELAYLOAD) - if(!ComponentBundledDLL::DoInitialize()) - { - return false; - } -#endif - return true; - } - virtual ~ComponentLame() - { - } -}; -MPT_REGISTERED_COMPONENT(ComponentLame, "") - - static void GenreEnumCallback(int num, const char *name, void *cookie) { MPT_UNREFERENCED_PARAMETER(num); @@ -430,7 +392,6 @@ class MP3LameStreamWriter : public StreamWriterBase { private: - const ComponentLame &lame; bool compatible; Encoder::Mode Mode; bool gfp_inited; @@ -446,9 +407,8 @@ std::streamoff id3v2Size; FileTags Tags; public: - MP3LameStreamWriter(const ComponentLame &lame_, std::ostream &stream, bool compatible, const Encoder::Settings &settings, const FileTags &tags) + MP3LameStreamWriter(std::ostream &stream, bool compatible, const Encoder::Settings &settings, const FileTags &tags) : StreamWriterBase(stream) - , lame(lame_) , compatible(compatible) { Mode = Encoder::ModeInvalid; @@ -703,21 +663,15 @@ #ifdef MPT_WITH_LAME if(type == MP3EncoderLame) { - if(IsComponentAvailable(m_Lame)) - { - m_Type = MP3EncoderLame; - SetTraits(BuildTraits(false)); - return; - } + m_Type = MP3EncoderLame; + SetTraits(BuildTraits(false)); + return; } if(type == MP3EncoderLameCompatible) { - if(IsComponentAvailable(m_Lame)) - { - m_Type = MP3EncoderLameCompatible; - SetTraits(BuildTraits(true)); - return; - } + m_Type = MP3EncoderLameCompatible; + SetTraits(BuildTraits(true)); + return; } #endif // MPT_WITH_LAME } @@ -727,8 +681,8 @@ { return false #ifdef MPT_WITH_LAME - || ((m_Type == MP3EncoderLame) && IsComponentAvailable(m_Lame)) - || ((m_Type == MP3EncoderLameCompatible) && IsComponentAvailable(m_Lame)) + || (m_Type == MP3EncoderLame) + || (m_Type == MP3EncoderLameCompatible) #endif // MPT_WITH_LAME ; } @@ -743,7 +697,7 @@ #ifdef MPT_WITH_LAME } else if(m_Type == MP3EncoderLame || m_Type == MP3EncoderLameCompatible) { - result = std::make_unique(*m_Lame, file, (m_Type == MP3EncoderLameCompatible), settings, tags); + result = std::make_unique(file, (m_Type == MP3EncoderLameCompatible), settings, tags); #endif // MPT_WITH_LAME } return result; Index: mptrack/StreamEncoderMP3.h =================================================================== --- mptrack/StreamEncoderMP3.h (revision 11462) +++ mptrack/StreamEncoderMP3.h (working copy) @@ -14,8 +14,6 @@ #include "StreamEncoder.h" -#include "../common/ComponentManager.h" - OPENMPT_NAMESPACE_BEGIN @@ -34,10 +32,6 @@ private: -#ifdef MPT_WITH_LAME - ComponentHandle m_Lame; -#endif - MP3EncoderType m_Type; public: Index: soundlib/SampleFormatMediaFoundation.cpp =================================================================== --- soundlib/SampleFormatMediaFoundation.cpp (revision 11462) +++ soundlib/SampleFormatMediaFoundation.cpp (working copy) @@ -136,12 +136,11 @@ } -class ComponentMediaFoundation : public ComponentLibrary +class ComponentMediaFoundation : public ComponentBuiltin { MPT_DECLARE_COMPONENT_MEMBERS public: ComponentMediaFoundation() - : ComponentLibrary(ComponentTypeSystem) { return; } @@ -151,17 +150,6 @@ { return false; } -#if !MPT_OS_WINDOWS_WINRT - if(!(true - && AddLibrary("mf", mpt::LibraryPath::System(P_("mf"))) - && AddLibrary("mfplat", mpt::LibraryPath::System(P_("mfplat"))) - && AddLibrary("mfreadwrite", mpt::LibraryPath::System(P_("mfreadwrite"))) - && AddLibrary("propsys", mpt::LibraryPath::System(P_("propsys"))) - )) - { - return false; - } -#endif // !MPT_OS_WINDOWS_WINRT if(!SUCCEEDED(MFStartup(MF_VERSION))) { return false; Index: soundlib/SampleFormatMP3.cpp =================================================================== --- soundlib/SampleFormatMP3.cpp (revision 11462) +++ soundlib/SampleFormatMP3.cpp (working copy) @@ -56,11 +56,7 @@ typedef ssize_t mpg123_ssize_t; class ComponentMPG123 -#if defined(MPT_ENABLE_MPG123_DELAYLOAD) - : public ComponentBundledDLL -#else : public ComponentBuiltin -#endif { MPT_DECLARE_COMPONENT_MEMBERS @@ -90,22 +86,12 @@ public: ComponentMPG123() -#if defined(MPT_ENABLE_MPG123_DELAYLOAD) - : ComponentBundledDLL(P_("openmpt-mpg123")) -#else : ComponentBuiltin() -#endif { return; } bool DoInitialize() override { -#if defined(MPT_ENABLE_MPG123_DELAYLOAD) - if(!ComponentBundledDLL::DoInitialize()) - { - return false; - } -#endif if(mpg123_init() != 0) { return false;