From b081312831a9c31036b2a793b8a6c1a8d2675567 Mon Sep 17 00:00:00 2001 From: NicknineTheEagle Date: Sun, 1 May 2022 19:07:53 +0300 Subject: [PATCH] Migrate to VS 2019 and foobar2000 2022-01-04 SDK --- cli/vgmstream_cli.vcxproj | 7 ++-- ext_libs/Getopt/getopt.vcxproj | 5 +-- ext_libs/ext_libs.vcxproj | 7 ++-- fb2k/foo_input_vgmstream.vcxproj | 36 ++++++++-------- fb2k/foo_prefs.cpp | 2 - fb2k/foo_prefs.h | 6 +-- fb2k/foo_streamfile.cpp | 4 +- fb2k/foo_vgmstream.cpp | 5 +-- fb2k/foo_vgmstream.h | 1 + msvc-build.ps1 | 20 +++++---- src/libvgmstream.vcxproj | 5 +-- vgmstream_full.sln | 72 +++++--------------------------- winamp/in_vgmstream.vcxproj | 7 ++-- xmplay/xmp-vgmstream.vcxproj | 7 ++-- 14 files changed, 62 insertions(+), 122 deletions(-) diff --git a/cli/vgmstream_cli.vcxproj b/cli/vgmstream_cli.vcxproj index b8f3e927..cdf0a7e2 100644 --- a/cli/vgmstream_cli.vcxproj +++ b/cli/vgmstream_cli.vcxproj @@ -26,7 +26,6 @@ - 8.1 test @@ -34,15 +33,15 @@ Application Unicode true - v141_xp + v142 Application Unicode - v141_xp + v142 - v141_xp + v142 diff --git a/ext_libs/Getopt/getopt.vcxproj b/ext_libs/Getopt/getopt.vcxproj index dea05db8..837dee07 100644 --- a/ext_libs/Getopt/getopt.vcxproj +++ b/ext_libs/Getopt/getopt.vcxproj @@ -22,18 +22,17 @@ - 8.1 StaticLibrary true - v141_xp + v142 MultiByte StaticLibrary - v141_xp + v142 MultiByte diff --git a/ext_libs/ext_libs.vcxproj b/ext_libs/ext_libs.vcxproj index 2fb350f1..80b3bf1f 100644 --- a/ext_libs/ext_libs.vcxproj +++ b/ext_libs/ext_libs.vcxproj @@ -20,16 +20,15 @@ - 8.1 Utility - v141_xp + v142 Utility - v141_xp + v142 @@ -109,7 +108,7 @@ lib /def:libspeex/libspeex.def /machine:x86 /out:libspeex/libspeex.lib libspeex/libspeex.lib;libspeex/libspeex.exp;%(Outputs) - + Building library stub lib /def:jansson.def /machine:x86 /out:jansson.lib jansson.lib;jansson.exp;%(Outputs) diff --git a/fb2k/foo_input_vgmstream.vcxproj b/fb2k/foo_input_vgmstream.vcxproj index 718da9a0..0c68fd70 100644 --- a/fb2k/foo_input_vgmstream.vcxproj +++ b/fb2k/foo_input_vgmstream.vcxproj @@ -26,22 +26,21 @@ - 7.0 DynamicLibrary Unicode true - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 - v141_xp + v142 @@ -70,10 +69,10 @@ Disabled - ..;$(DependenciesDir)/qaac/mp4v2/include;$(DependenciesDir)/fdk-aac/libSYS/include;$(DependenciesDir)/fdk-aac/libAACdec/include;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;$(DependenciesDir)/qaac/mp4v2/include;%(AdditionalIncludeDirectories) + ..;$(DependenciesDir)/wtl/include;$(DependenciesDir)/foobar;%(AdditionalIncludeDirectories) WIN32;VGMSTREAM_VERSION_AUTO;_DEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks - MultiThreadedDebug + MultiThreadedDebugDLL Level3 @@ -86,6 +85,7 @@ $(DependenciesDir)/foobar/foobar2000/shared/shared.lib;%(AdditionalLibraryDirectories) %(DelayLoadDLLs) true + libcmt.lib;msvcrt.lib;libcmtd.lib "$(ProjectDir)..\version-make.bat" @@ -96,9 +96,9 @@ - ..;$(DependenciesDir)/WTL/Include;$(DependenciesDir)/foobar/foobar2000/SDK;$(DependenciesDir)/foobar/foobar2000/shared;$(DependenciesDir)/foobar/foobar2000;%(AdditionalIncludeDirectories) + ..;$(DependenciesDir)/wtl/include;$(DependenciesDir)/foobar;%(AdditionalIncludeDirectories) WIN32;VGMSTREAM_VERSION_AUTO;NDEBUG;_WINDOWS;_USRDLL;IN_VGMSTREAM_EXPORTS;%(PreprocessorDefinitions) - MultiThreaded + MultiThreadedDLL Level3 @@ -110,12 +110,12 @@ $(DependenciesDir)/foobar/foobar2000/shared/shared.lib;../ext_libs/libvorbis.lib;../ext_libs/libmpg123-0.lib;../ext_libs/libg719_decode.lib;../ext_libs/avcodec.lib;../ext_libs/avformat.lib;../ext_libs/avutil.lib;../ext_libs/swresample.lib;../ext_libs/libatrac9.lib;../ext_libs/libcelt-0061.lib;../ext_libs/libcelt-0110.lib;../ext_libs/libspeex/libspeex.lib;%(AdditionalDependencies) $(DependenciesDir)/foobar/foobar2000/shared/shared.lib;%(AdditionalLibraryDirectories) - %(IgnoreSpecificDefaultLibraries) %(DelayLoadDLLs) true true true Windows + libcmt.lib;libcmtd.lib;msvcrtd.lib "$(ProjectDir)..\version-make.bat" @@ -139,27 +139,27 @@ - - - {622e8b19-8109-4717-bd4d-9657aa78363e} - - + {71ad2674-065b-48f5-b8b0-e1f9d3892081} - + {ee47764e-a202-4f85-a767-abdab4aff35f} - + {e8091321-d79d-4575-86ef-064ea1a4a20d} - + {ebfffb4e-261d-44d3-b89c-957b31a0bf9c} + + {7729eb82-4069-4414-964b-ad399091a03f} + {10e6bfc6-1e5b-46e4-ba42-f04dfbd0abff} diff --git a/fb2k/foo_prefs.cpp b/fb2k/foo_prefs.cpp index b7b43cb0..97e338f7 100755 --- a/fb2k/foo_prefs.cpp +++ b/fb2k/foo_prefs.cpp @@ -4,8 +4,6 @@ #include #include -#include -#include #include "foo_prefs.h" extern "C" { #include "../src/vgmstream.h" diff --git a/fb2k/foo_prefs.h b/fb2k/foo_prefs.h index 37ec2d7d..b75121cf 100755 --- a/fb2k/foo_prefs.h +++ b/fb2k/foo_prefs.h @@ -3,10 +3,8 @@ #ifndef _FOO_PREFS_H #define _FOO_PREFS_H -#include -#include -#include -#include +#include +#include #include "resource.h" #define DEFAULT_FADE_SECONDS "10.00" diff --git a/fb2k/foo_streamfile.cpp b/fb2k/foo_streamfile.cpp index be5399c0..c4aa0a84 100644 --- a/fb2k/foo_streamfile.cpp +++ b/fb2k/foo_streamfile.cpp @@ -5,9 +5,7 @@ #include #include -#include -#include -#include +#include extern "C" { #include "../src/streamfile.h" diff --git a/fb2k/foo_vgmstream.cpp b/fb2k/foo_vgmstream.cpp index 0f863c2b..3e523298 100644 --- a/fb2k/foo_vgmstream.cpp +++ b/fb2k/foo_vgmstream.cpp @@ -8,9 +8,7 @@ #include #include -#include -#include -#include +#include extern "C" { #include "../src/vgmstream.h" @@ -329,6 +327,7 @@ void input_vgmstream::decode_on_idle(abort_callback & p_abort) {/*m_file->on_idl void input_vgmstream::retag_set_info(t_uint32 p_subsong, const file_info & p_info, abort_callback & p_abort) { /*throw exception_io_data();*/ } void input_vgmstream::retag_commit(abort_callback & p_abort) { /*throw exception_io_data();*/ } +void input_vgmstream::remove_tags(abort_callback & p_abort) { /*throw exception_io_data();*/ } bool input_vgmstream::g_is_our_content_type(const char * p_content_type) { return false; } diff --git a/fb2k/foo_vgmstream.h b/fb2k/foo_vgmstream.h index f452ad6e..bb7f20ca 100644 --- a/fb2k/foo_vgmstream.h +++ b/fb2k/foo_vgmstream.h @@ -30,6 +30,7 @@ class input_vgmstream : public input_stubs { void retag_set_info(t_uint32 p_subsong, const file_info & p_info, abort_callback & p_abort); void retag_commit(abort_callback & p_abort); + void remove_tags(abort_callback & p_abort); static bool g_is_our_content_type(const char * p_content_type); static bool g_is_our_path(const char * p_path, const char * p_extension); diff --git a/msvc-build.ps1 b/msvc-build.ps1 index 40fff8c9..4aeafad4 100644 --- a/msvc-build.ps1 +++ b/msvc-build.ps1 @@ -6,7 +6,7 @@ Param( ) ############################################################################### -# CONFIG +# CONFIG # set these vars to override project defaults # can also create a mssvc-build.config.ps1 with those ############################################################################### @@ -75,7 +75,7 @@ function Init Download "https://github.com/Microsoft/vswhere/releases/download/2.6.7/vswhere.exe" "$dependencies\vswhere.exe" # foobar: wtl - Download "https://www.nuget.org/api/v2/package/wtl/9.1.1" "$dependencies\wtl.zip" + Download "https://www.nuget.org/api/v2/package/wtl/10.0.10320" "$dependencies\wtl.zip" Unzip "$dependencies\wtl.zip" "$dependencies\wtl_tmp" Move-Item "$dependencies\wtl_tmp\lib\native" "$dependencies\wtl" Remove-Item -Path "$dependencies\wtl_tmp" -Recurse @@ -90,7 +90,7 @@ function Init #Download "https://www.foobar2000.org/files/SDK-2018-01-11.zip" "$dependencies\foobar.zip" # foobar: sdk static mirror - Download "https://github.com/vgmstream/vgmstream-deps/raw/master/foobar2000/SDK-2018-02-05.zip" "$dependencies\foobar.zip" + Download "https://github.com/vgmstream/vgmstream-deps/raw/master/foobar2000/SDK-2022-01-04.zip" "$dependencies\foobar.zip" Unzip "$dependencies\foobar.zip" "$dependencies\foobar" # foobar: aac (not used ATM) @@ -108,13 +108,17 @@ function Init # open foobar sdk project and modify WTL path # (maybe should just pass include to CL envvar: set CL=/I"(path)\WTL\Include") - [xml]$proj = Get-Content $dependencies\foobar\foobar2000\ATLHelpers\foobar2000_ATL_helpers.vcxproj + [xml]$proj = Get-Content $dependencies\foobar\foobar2000\helpers\foobar2000_sdk_helpers.vcxproj $proj.project.ItemDefinitionGroup | ForEach-Object { - $includes = $proj.CreateElement("AdditionalIncludeDirectories", $proj.project.NamespaceURI) - $includes.InnerText = "../../../wtl/include" - $_.ClCompile.AppendChild($includes) + $_.ClCompile.AdditionalIncludeDirectories += ";../../../wtl/include" } - $proj.Save("$dependencies\foobar\foobar2000\ATLHelpers\foobar2000_ATL_helpers.vcxproj") + $proj.Save("$dependencies\foobar\foobar2000\helpers\foobar2000_sdk_helpers.vcxproj") + + [xml]$proj = Get-Content $dependencies\foobar\libPPUI\libPPUI.vcxproj + $proj.project.ItemDefinitionGroup | ForEach-Object { + $_.ClCompile.AdditionalIncludeDirectories += ";../../wtl/include" + } + $proj.Save("$dependencies\foobar\libPPUI\libPPUI.vcxproj") } # main build diff --git a/src/libvgmstream.vcxproj b/src/libvgmstream.vcxproj index 8f6f33bd..497f6d30 100644 --- a/src/libvgmstream.vcxproj +++ b/src/libvgmstream.vcxproj @@ -22,17 +22,16 @@ - 8.1 StaticLibrary true - v141_xp + v142 StaticLibrary - v141_xp + v142 diff --git a/vgmstream_full.sln b/vgmstream_full.sln index 138c3ad6..e4818e7a 100644 --- a/vgmstream_full.sln +++ b/vgmstream_full.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27130.2020 +# Visual Studio Version 17 +VisualStudioVersion = 17.1.32421.90 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libvgmstream", "src\libvgmstream.vcxproj", "{54A6AD11-5369-4895-A06F-E255ABB99B11}" EndProject @@ -19,145 +19,93 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foobar2000_SDK", "dependenc EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foobar2000_sdk_helpers", "dependencies\foobar\foobar2000\helpers\foobar2000_sdk_helpers.vcxproj", "{EE47764E-A202-4F85-A767-ABDAB4AFF35F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foobar2000_ATL_helpers", "dependencies\foobar\foobar2000\ATLHelpers\foobar2000_ATL_helpers.vcxproj", "{622E8B19-8109-4717-BD4D-9657AA78363E}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foobar2000_component_client", "dependencies\foobar\foobar2000\foobar2000_component_client\foobar2000_component_client.vcxproj", "{71AD2674-065B-48F5-B8B0-E1F9D3892081}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pfc", "dependencies\foobar\pfc\pfc.vcxproj", "{EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmp-vgmstream", "xmplay\xmp-vgmstream.vcxproj", "{49AF76F7-CBA0-4486-9DDF-51F30DF45F33}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libPPUI", "dependencies\foobar\libPPUI\libPPUI.vcxproj", "{7729EB82-4069-4414-964B-AD399091A03F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 Release|Win32 = Release|Win32 - Release|x64 = Release|x64 Template|Win32 = Template|Win32 - Template|x64 = Template|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {54A6AD11-5369-4895-A06F-E255ABB99B11}.Debug|Win32.ActiveCfg = Debug|Win32 {54A6AD11-5369-4895-A06F-E255ABB99B11}.Debug|Win32.Build.0 = Debug|Win32 - {54A6AD11-5369-4895-A06F-E255ABB99B11}.Debug|x64.ActiveCfg = Debug|Win32 {54A6AD11-5369-4895-A06F-E255ABB99B11}.Release|Win32.ActiveCfg = Release|Win32 {54A6AD11-5369-4895-A06F-E255ABB99B11}.Release|Win32.Build.0 = Release|Win32 - {54A6AD11-5369-4895-A06F-E255ABB99B11}.Release|x64.ActiveCfg = Release|Win32 {54A6AD11-5369-4895-A06F-E255ABB99B11}.Template|Win32.ActiveCfg = Release|Win32 {54A6AD11-5369-4895-A06F-E255ABB99B11}.Template|Win32.Build.0 = Release|Win32 - {54A6AD11-5369-4895-A06F-E255ABB99B11}.Template|x64.ActiveCfg = Release|Win32 - {54A6AD11-5369-4895-A06F-E255ABB99B11}.Template|x64.Build.0 = Release|Win32 {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Debug|Win32.ActiveCfg = Debug|Win32 {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Debug|Win32.Build.0 = Debug|Win32 - {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Debug|x64.ActiveCfg = Debug|Win32 {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Release|Win32.ActiveCfg = Release|Win32 {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Release|Win32.Build.0 = Release|Win32 - {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Release|x64.ActiveCfg = Release|Win32 {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Template|Win32.ActiveCfg = Release|Win32 {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Template|Win32.Build.0 = Release|Win32 - {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Template|x64.ActiveCfg = Release|Win32 - {10E6BFC6-1E5B-46E4-BA42-F04DFBD0ABFF}.Template|x64.Build.0 = Release|Win32 {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Debug|Win32.ActiveCfg = Debug|Win32 {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Debug|Win32.Build.0 = Debug|Win32 - {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Debug|x64.ActiveCfg = Debug|Win32 {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Release|Win32.ActiveCfg = Release|Win32 {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Release|Win32.Build.0 = Release|Win32 - {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Release|x64.ActiveCfg = Release|Win32 {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Template|Win32.ActiveCfg = Release|Win32 {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Template|Win32.Build.0 = Release|Win32 - {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Template|x64.ActiveCfg = Release|Win32 - {330B53AE-4FAE-46DA-8785-9016DB4E3E23}.Template|x64.Build.0 = Release|Win32 {AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}.Debug|Win32.ActiveCfg = Debug|Win32 {AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}.Debug|Win32.Build.0 = Debug|Win32 - {AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}.Debug|x64.ActiveCfg = Debug|Win32 {AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}.Release|Win32.ActiveCfg = Release|Win32 {AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}.Release|Win32.Build.0 = Release|Win32 - {AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}.Release|x64.ActiveCfg = Release|Win32 {AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}.Template|Win32.ActiveCfg = Template|Win32 {AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}.Template|Win32.Build.0 = Template|Win32 - {AF7D88A0-3CB1-4CD8-BAD1-0305EB996D69}.Template|x64.ActiveCfg = Template|Win32 {42D86561-8CE4-40F5-86CE-58C986B77502}.Debug|Win32.ActiveCfg = Debug|Win32 {42D86561-8CE4-40F5-86CE-58C986B77502}.Debug|Win32.Build.0 = Debug|Win32 - {42D86561-8CE4-40F5-86CE-58C986B77502}.Debug|x64.ActiveCfg = Debug|Win32 {42D86561-8CE4-40F5-86CE-58C986B77502}.Release|Win32.ActiveCfg = Release|Win32 {42D86561-8CE4-40F5-86CE-58C986B77502}.Release|Win32.Build.0 = Release|Win32 - {42D86561-8CE4-40F5-86CE-58C986B77502}.Release|x64.ActiveCfg = Release|Win32 {42D86561-8CE4-40F5-86CE-58C986B77502}.Template|Win32.ActiveCfg = Template|Win32 {42D86561-8CE4-40F5-86CE-58C986B77502}.Template|Win32.Build.0 = Template|Win32 - {42D86561-8CE4-40F5-86CE-58C986B77502}.Template|x64.ActiveCfg = Template|Win32 {F3739CF2-F422-4A3D-BB0A-53C5D4C5ABA0}.Debug|Win32.ActiveCfg = Debug|Win32 {F3739CF2-F422-4A3D-BB0A-53C5D4C5ABA0}.Debug|Win32.Build.0 = Debug|Win32 - {F3739CF2-F422-4A3D-BB0A-53C5D4C5ABA0}.Debug|x64.ActiveCfg = Debug|Win32 {F3739CF2-F422-4A3D-BB0A-53C5D4C5ABA0}.Release|Win32.ActiveCfg = Release|Win32 {F3739CF2-F422-4A3D-BB0A-53C5D4C5ABA0}.Release|Win32.Build.0 = Release|Win32 - {F3739CF2-F422-4A3D-BB0A-53C5D4C5ABA0}.Release|x64.ActiveCfg = Release|Win32 {F3739CF2-F422-4A3D-BB0A-53C5D4C5ABA0}.Template|Win32.ActiveCfg = Template|Win32 {F3739CF2-F422-4A3D-BB0A-53C5D4C5ABA0}.Template|Win32.Build.0 = Template|Win32 - {F3739CF2-F422-4A3D-BB0A-53C5D4C5ABA0}.Template|x64.ActiveCfg = Template|Win32 {E8091321-D79D-4575-86EF-064EA1A4A20D}.Debug|Win32.ActiveCfg = Debug|Win32 {E8091321-D79D-4575-86EF-064EA1A4A20D}.Debug|Win32.Build.0 = Debug|Win32 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Debug|x64.ActiveCfg = Debug|Win32 {E8091321-D79D-4575-86EF-064EA1A4A20D}.Release|Win32.ActiveCfg = Release|Win32 {E8091321-D79D-4575-86EF-064EA1A4A20D}.Release|Win32.Build.0 = Release|Win32 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Release|x64.ActiveCfg = Release|Win32 {E8091321-D79D-4575-86EF-064EA1A4A20D}.Template|Win32.ActiveCfg = Release|Win32 {E8091321-D79D-4575-86EF-064EA1A4A20D}.Template|Win32.Build.0 = Release|Win32 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Template|x64.ActiveCfg = Release|Win32 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Template|x64.Build.0 = Release|Win32 - {E8091321-D79D-4575-86EF-064EA1A4A20D}.Template|x64.Deploy.0 = Release|Win32 {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Debug|Win32.ActiveCfg = Debug|Win32 {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Debug|Win32.Build.0 = Debug|Win32 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Debug|x64.ActiveCfg = Debug|Win32 {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Release|Win32.ActiveCfg = Release|Win32 {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Release|Win32.Build.0 = Release|Win32 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Release|x64.ActiveCfg = Release|Win32 {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Template|Win32.ActiveCfg = Release|Win32 {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Template|Win32.Build.0 = Release|Win32 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Template|x64.ActiveCfg = Release|Win32 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Template|x64.Build.0 = Release|Win32 - {EE47764E-A202-4F85-A767-ABDAB4AFF35F}.Template|x64.Deploy.0 = Release|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Debug|Win32.ActiveCfg = Debug|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Debug|Win32.Build.0 = Debug|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Debug|x64.ActiveCfg = Debug|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Release|Win32.ActiveCfg = Release|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Release|Win32.Build.0 = Release|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Release|x64.ActiveCfg = Release|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Template|Win32.ActiveCfg = Release|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Template|Win32.Build.0 = Release|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Template|x64.ActiveCfg = Release|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Template|x64.Build.0 = Release|Win32 - {622E8B19-8109-4717-BD4D-9657AA78363E}.Template|x64.Deploy.0 = Release|Win32 {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Debug|Win32.ActiveCfg = Debug|Win32 {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Debug|Win32.Build.0 = Debug|Win32 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Debug|x64.ActiveCfg = Debug|Win32 {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Release|Win32.ActiveCfg = Release|Win32 {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Release|Win32.Build.0 = Release|Win32 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Release|x64.ActiveCfg = Release|Win32 {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Template|Win32.ActiveCfg = Release|Win32 {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Template|Win32.Build.0 = Release|Win32 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Template|x64.ActiveCfg = Release|Win32 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Template|x64.Build.0 = Release|Win32 - {71AD2674-065B-48F5-B8B0-E1F9D3892081}.Template|x64.Deploy.0 = Release|Win32 {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Debug|Win32.ActiveCfg = Debug|Win32 {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Debug|Win32.Build.0 = Debug|Win32 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Debug|x64.ActiveCfg = Debug|Win32 {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Release|Win32.ActiveCfg = Release|Win32 {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Release|Win32.Build.0 = Release|Win32 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Release|x64.ActiveCfg = Release|Win32 {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Template|Win32.ActiveCfg = Release|Win32 {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Template|Win32.Build.0 = Release|Win32 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Template|x64.ActiveCfg = Release|Win32 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Template|x64.Build.0 = Release|Win32 - {EBFFFB4E-261D-44D3-B89C-957B31A0BF9C}.Template|x64.Deploy.0 = Release|Win32 {49AF76F7-CBA0-4486-9DDF-51F30DF45F33}.Debug|Win32.ActiveCfg = Debug|Win32 {49AF76F7-CBA0-4486-9DDF-51F30DF45F33}.Debug|Win32.Build.0 = Debug|Win32 - {49AF76F7-CBA0-4486-9DDF-51F30DF45F33}.Debug|x64.ActiveCfg = Debug|Win32 {49AF76F7-CBA0-4486-9DDF-51F30DF45F33}.Release|Win32.ActiveCfg = Release|Win32 {49AF76F7-CBA0-4486-9DDF-51F30DF45F33}.Release|Win32.Build.0 = Release|Win32 - {49AF76F7-CBA0-4486-9DDF-51F30DF45F33}.Release|x64.ActiveCfg = Release|Win32 {49AF76F7-CBA0-4486-9DDF-51F30DF45F33}.Template|Win32.ActiveCfg = Template|Win32 {49AF76F7-CBA0-4486-9DDF-51F30DF45F33}.Template|Win32.Build.0 = Template|Win32 - {49AF76F7-CBA0-4486-9DDF-51F30DF45F33}.Template|x64.ActiveCfg = Template|Win32 + {7729EB82-4069-4414-964B-AD399091A03F}.Debug|Win32.ActiveCfg = Debug|Win32 + {7729EB82-4069-4414-964B-AD399091A03F}.Debug|Win32.Build.0 = Debug|Win32 + {7729EB82-4069-4414-964B-AD399091A03F}.Release|Win32.ActiveCfg = Release|Win32 + {7729EB82-4069-4414-964B-AD399091A03F}.Release|Win32.Build.0 = Release|Win32 + {7729EB82-4069-4414-964B-AD399091A03F}.Template|Win32.ActiveCfg = Debug|Win32 + {7729EB82-4069-4414-964B-AD399091A03F}.Template|Win32.Build.0 = Debug|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/winamp/in_vgmstream.vcxproj b/winamp/in_vgmstream.vcxproj index 037812ec..39cb2fc8 100644 --- a/winamp/in_vgmstream.vcxproj +++ b/winamp/in_vgmstream.vcxproj @@ -26,22 +26,21 @@ - 7.0 DynamicLibrary MultiByte true - v141_xp + v142 DynamicLibrary Unicode - v141_xp + v142 - v141_xp + v142 diff --git a/xmplay/xmp-vgmstream.vcxproj b/xmplay/xmp-vgmstream.vcxproj index 784d57fe..adc901b9 100644 --- a/xmplay/xmp-vgmstream.vcxproj +++ b/xmplay/xmp-vgmstream.vcxproj @@ -17,22 +17,21 @@ {49AF76F7-CBA0-4486-9DDF-51F30DF45F33} xmp-vgmstream - 8.1 DynamicLibrary MultiByte true - v141_xp + v142 DynamicLibrary MultiByte - v141_xp + v142 - v141_xp + v142