From 90a92c80bdf936ae2f8e1d6e46e44f0f168b74fa Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 3 Dec 2022 15:29:52 -0800 Subject: [PATCH 1/8] Update project to use C++ 17 as the default standard library. --- .cmake/ConfigureCompilerFlags.cmake | 2 +- script/build-vendor-libraries.sh | 2 +- src/3rdparty/3rdparty.vcxproj | 12 +++++++ src/core_c_demo/core_c_demo.vcxproj | 12 +++++++ src/musikcore/library/track/TrackList.cpp | 7 +++- src/musikcore/musikcore.vcxproj | 12 +++++++ src/musikcube/musikcube.vcxproj | 12 +++++++ src/plugins/cddadecoder/cddadecoder.vcxproj | 12 +++++++ .../directsoundout/directsoundout.vcxproj | 12 +++++++ .../ffmpegdecoder/ffmpegdecoder.vcxproj | 12 +++++++ src/plugins/gmedecoder/gmedecoder.vcxproj | 12 +++++++ .../httpdatastream/httpdatastream.vcxproj | 12 +++++++ .../libopenmptdecoder.vcxproj | 36 +++++++------------ src/plugins/nullout/nullout.vcxproj | 12 +++++++ src/plugins/server/server.vcxproj | 12 +++++++ .../stockencoders/stockencoders.vcxproj | 12 +++++++ src/plugins/supereqdsp/supereqdsp.vcxproj | 12 +++++++ .../taglib_plugin/taglib_plugin.vcxproj | 12 +++++++ src/plugins/wasapiout/wasapiout.vcxproj | 12 +++++++ src/plugins/waveout/waveout.vcxproj | 12 +++++++ .../win32gdivis/GdiVis-musikcube.vcxproj | 12 +++++++ .../win32globalhotkeys.vcxproj | 12 +++++++ 22 files changed, 236 insertions(+), 27 deletions(-) diff --git a/.cmake/ConfigureCompilerFlags.cmake b/.cmake/ConfigureCompilerFlags.cmake index 97c51f652..5995719f3 100644 --- a/.cmake/ConfigureCompilerFlags.cmake +++ b/.cmake/ConfigureCompilerFlags.cmake @@ -1,4 +1,4 @@ -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wno-unused-result -Wno-deprecated-declarations") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wno-unused-result -Wno-deprecated-declarations") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DDEBUG -g -frtti -fexceptions") set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DDEBUG") diff --git a/script/build-vendor-libraries.sh b/script/build-vendor-libraries.sh index 5c0dd93eb..e050990fe 100755 --- a/script/build-vendor-libraries.sh +++ b/script/build-vendor-libraries.sh @@ -108,7 +108,7 @@ function fetch_packages() { function build_boost() { BOOST_CXX_FLAGS="-fPIC" if [[ $OS == "Darwin" ]]; then - BOOST_CXX_FLAGS="-fPIC -std=c++14 -stdlib=libc++" + BOOST_CXX_FLAGS="-fPIC -std=c++17 -stdlib=libc++" fi tar xvfj boost_${BOOST_VERSION}.tar.bz2 diff --git a/src/3rdparty/3rdparty.vcxproj b/src/3rdparty/3rdparty.vcxproj index 6b0744ddb..1f73ba4ad 100755 --- a/src/3rdparty/3rdparty.vcxproj +++ b/src/3rdparty/3rdparty.vcxproj @@ -259,6 +259,7 @@ $(IntDir) $(IntDir)$(ProjectName).pdb true + stdcpp17 @@ -277,6 +278,7 @@ $(IntDir) $(IntDir)$(ProjectName).pdb true + stdcpp17 @@ -295,6 +297,7 @@ $(IntDir) $(IntDir)$(ProjectName).pdb true + stdcpp17 @@ -313,6 +316,7 @@ $(IntDir) $(IntDir)$(ProjectName).pdb true + stdcpp17 @@ -331,6 +335,7 @@ $(IntDir) $(IntDir)$(ProjectName).pdb true + stdcpp17 @@ -349,6 +354,7 @@ $(IntDir) $(IntDir)$(ProjectName).pdb true + stdcpp17 @@ -369,6 +375,7 @@ true Sync true + stdcpp17 @@ -389,6 +396,7 @@ true Sync true + stdcpp17 @@ -409,6 +417,7 @@ true Sync true + stdcpp17 @@ -429,6 +438,7 @@ true Sync true + stdcpp17 @@ -449,6 +459,7 @@ true Sync true + stdcpp17 @@ -469,6 +480,7 @@ true Sync true + stdcpp17 diff --git a/src/core_c_demo/core_c_demo.vcxproj b/src/core_c_demo/core_c_demo.vcxproj index 871c7e106..026f321ed 100644 --- a/src/core_c_demo/core_c_demo.vcxproj +++ b/src/core_c_demo/core_c_demo.vcxproj @@ -285,6 +285,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) @@ -326,6 +327,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;$(OutputPath);%(AdditionalLibraryDirectories) @@ -367,6 +369,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) @@ -406,6 +409,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) @@ -445,6 +449,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;$(OutputPath);%(AdditionalLibraryDirectories) @@ -484,6 +489,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) @@ -525,6 +531,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true Sync + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) @@ -572,6 +579,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;$(OutputPath);%(AdditionalLibraryDirectories) @@ -619,6 +627,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) @@ -665,6 +674,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true Sync + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) @@ -711,6 +721,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;$(OutputPath);%(AdditionalLibraryDirectories) @@ -757,6 +768,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) diff --git a/src/musikcore/library/track/TrackList.cpp b/src/musikcore/library/track/TrackList.cpp index e098a879f..145f6be8a 100755 --- a/src/musikcore/library/track/TrackList.cpp +++ b/src/musikcore/library/track/TrackList.cpp @@ -47,12 +47,15 @@ #include #include #include +#include +#include using namespace musik::core; using namespace musik::core::db; using namespace musik::core::library; using namespace musik::core::library::query; using namespace musik::core::sdk; +using namespace std::chrono; static constexpr size_t kDefaultCacheSize = 50; static constexpr int64_t kCacheWindowTimeoutMs = 150LL; @@ -218,7 +221,9 @@ int TrackList::IndexOf(int64_t id) const { } void TrackList::Shuffle() { - std::random_shuffle(this->ids.begin(), this->ids.end()); + auto seed = static_cast(system_clock::now().time_since_epoch().count()); + auto rng = std::default_random_engine(seed); + std::shuffle(this->ids.begin(), this->ids.end(), rng); } void TrackList::Clear() noexcept { diff --git a/src/musikcore/musikcore.vcxproj b/src/musikcore/musikcore.vcxproj index f7f96771a..30c771232 100644 --- a/src/musikcore/musikcore.vcxproj +++ b/src/musikcore/musikcore.vcxproj @@ -262,6 +262,7 @@ true /bigobj %(AdditionalOptions) true + stdcpp17 @@ -282,6 +283,7 @@ true /bigobj %(AdditionalOptions) true + stdcpp17 libcurl.lib;libssl-1_1.lib;libcrypto-1_1.lib;%(AdditionalDependencies) @@ -306,6 +308,7 @@ true /bigobj %(AdditionalOptions) true + stdcpp17 @@ -325,6 +328,7 @@ true /bigobj %(AdditionalOptions) true + stdcpp17 @@ -344,6 +348,7 @@ true /bigobj %(AdditionalOptions) true + stdcpp17 libcurl.lib;libssl-1_1-x64.lib;libcrypto-1_1-x64.lib;%(AdditionalDependencies) @@ -367,6 +372,7 @@ true /bigobj %(AdditionalOptions) true + stdcpp17 @@ -388,6 +394,7 @@ Sync /bigobj %(AdditionalOptions) true + stdcpp17 @@ -409,6 +416,7 @@ Sync /bigobj %(AdditionalOptions) true + stdcpp17 libcurl.lib;libssl-1_1.lib;libcrypto-1_1.lib;%(AdditionalDependencies) @@ -434,6 +442,7 @@ Sync /bigobj %(AdditionalOptions) true + stdcpp17 @@ -455,6 +464,7 @@ Sync /bigobj %(AdditionalOptions) true + stdcpp17 @@ -476,6 +486,7 @@ Sync /bigobj %(AdditionalOptions) true + stdcpp17 libcurl.lib;libssl-1_1-x64.lib;libcrypto-1_1-x64.lib;%(AdditionalDependencies) @@ -501,6 +512,7 @@ Sync /bigobj %(AdditionalOptions) true + stdcpp17 diff --git a/src/musikcube/musikcube.vcxproj b/src/musikcube/musikcube.vcxproj index 3fc2083be..4de9bac25 100755 --- a/src/musikcube/musikcube.vcxproj +++ b/src/musikcube/musikcube.vcxproj @@ -294,6 +294,7 @@ true /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) @@ -340,6 +341,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) @@ -386,6 +388,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) @@ -431,6 +434,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) @@ -475,6 +479,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) @@ -519,6 +524,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e true /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) @@ -566,6 +572,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) @@ -618,6 +625,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) @@ -670,6 +678,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) @@ -722,6 +731,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) @@ -773,6 +783,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) @@ -824,6 +835,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Sync /bigobj %(AdditionalOptions) true + stdcpp17 ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) diff --git a/src/plugins/cddadecoder/cddadecoder.vcxproj b/src/plugins/cddadecoder/cddadecoder.vcxproj index 99672dda7..21ae3b2db 100755 --- a/src/plugins/cddadecoder/cddadecoder.vcxproj +++ b/src/plugins/cddadecoder/cddadecoder.vcxproj @@ -284,6 +284,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -308,6 +309,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -332,6 +334,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -355,6 +358,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -378,6 +382,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -401,6 +406,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -427,6 +433,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -452,6 +459,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -477,6 +485,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -502,6 +511,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -527,6 +537,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -552,6 +563,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) diff --git a/src/plugins/directsoundout/directsoundout.vcxproj b/src/plugins/directsoundout/directsoundout.vcxproj index f32c3ffd9..cf3ca5beb 100644 --- a/src/plugins/directsoundout/directsoundout.vcxproj +++ b/src/plugins/directsoundout/directsoundout.vcxproj @@ -275,6 +275,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -299,6 +300,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -323,6 +325,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -347,6 +350,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -370,6 +374,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -393,6 +398,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -420,6 +426,7 @@ Full Sync true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -451,6 +458,7 @@ Full Sync true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -482,6 +490,7 @@ Full Sync true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -513,6 +522,7 @@ Full Sync true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -543,6 +553,7 @@ Full Sync true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) @@ -573,6 +584,7 @@ Full Sync true + stdcpp17 dsound.lib;dxguid.lib;%(AdditionalDependencies) diff --git a/src/plugins/ffmpegdecoder/ffmpegdecoder.vcxproj b/src/plugins/ffmpegdecoder/ffmpegdecoder.vcxproj index 25502640a..fe9b8bc24 100644 --- a/src/plugins/ffmpegdecoder/ffmpegdecoder.vcxproj +++ b/src/plugins/ffmpegdecoder/ffmpegdecoder.vcxproj @@ -238,6 +238,7 @@ MultiThreadedDebug 4996 true + stdcpp17 ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) @@ -258,6 +259,7 @@ MultiThreadedDebug 4996 true + stdcpp17 ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) @@ -278,6 +280,7 @@ MultiThreadedDebug 4996 true + stdcpp17 ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) @@ -297,6 +300,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) @@ -316,6 +320,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) @@ -335,6 +340,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 avcodec-musikcube.lib;avformat-musikcube.lib;avutil-musikcube.lib;swresample-musikcube.lib;%(AdditionalDependencies) @@ -361,6 +367,7 @@ Sync 4996 true + stdcpp17 true @@ -392,6 +399,7 @@ Sync 4996 true + stdcpp17 true @@ -423,6 +431,7 @@ Sync 4996 true + stdcpp17 true @@ -449,6 +458,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 true @@ -472,6 +482,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 true @@ -495,6 +506,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 true diff --git a/src/plugins/gmedecoder/gmedecoder.vcxproj b/src/plugins/gmedecoder/gmedecoder.vcxproj index ea127ed9d..46d7decbc 100644 --- a/src/plugins/gmedecoder/gmedecoder.vcxproj +++ b/src/plugins/gmedecoder/gmedecoder.vcxproj @@ -275,6 +275,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -299,6 +300,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -323,6 +325,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -347,6 +350,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -370,6 +374,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -393,6 +398,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -420,6 +426,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -451,6 +458,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -482,6 +490,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -513,6 +522,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -543,6 +553,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -573,6 +584,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) diff --git a/src/plugins/httpdatastream/httpdatastream.vcxproj b/src/plugins/httpdatastream/httpdatastream.vcxproj index 5b5b64622..1f90309b8 100644 --- a/src/plugins/httpdatastream/httpdatastream.vcxproj +++ b/src/plugins/httpdatastream/httpdatastream.vcxproj @@ -260,6 +260,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -284,6 +285,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -308,6 +310,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -331,6 +334,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -354,6 +358,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -377,6 +382,7 @@ $(IntDir) $(IntDir) true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -403,6 +409,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -428,6 +435,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -453,6 +461,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -478,6 +487,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -503,6 +513,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) @@ -528,6 +539,7 @@ true Sync true + stdcpp17 shlwapi.lib;libcurl.lib;%(AdditionalDependencies) diff --git a/src/plugins/libopenmptdecoder/libopenmptdecoder.vcxproj b/src/plugins/libopenmptdecoder/libopenmptdecoder.vcxproj index 8bda0c0f6..1f54c2568 100644 --- a/src/plugins/libopenmptdecoder/libopenmptdecoder.vcxproj +++ b/src/plugins/libopenmptdecoder/libopenmptdecoder.vcxproj @@ -237,8 +237,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions) MultiThreadedDebug 4996 - - + stdcpp17 true @@ -259,8 +258,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions) MultiThreadedDebug 4996 - - + stdcpp17 true @@ -281,8 +279,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions) MultiThreadedDebug 4996 - - + stdcpp17 true @@ -302,8 +299,7 @@ ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions) MultiThreadedDebug - - + stdcpp17 true @@ -319,8 +315,7 @@ ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions) MultiThreadedDebug - - + stdcpp17 true @@ -336,8 +331,7 @@ ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions) MultiThreadedDebug - - + stdcpp17 true @@ -360,8 +354,7 @@ Speed Sync 4996 - - + stdcpp17 true @@ -393,8 +386,7 @@ Speed Sync 4996 - - + stdcpp17 true @@ -426,8 +418,7 @@ Speed Sync 4996 - - + stdcpp17 true @@ -454,8 +445,7 @@ ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions) MultiThreaded - - + stdcpp17 true @@ -475,8 +465,7 @@ ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions) MultiThreaded - - + stdcpp17 true @@ -496,8 +485,7 @@ ../../3rdparty/win32_include;../../;./;%(AdditionalIncludeDirectories) WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;LIBOPENMPT_USE_DLL;%(PreprocessorDefinitions) MultiThreaded - - + stdcpp17 true diff --git a/src/plugins/nullout/nullout.vcxproj b/src/plugins/nullout/nullout.vcxproj index 5e929031f..36f6b999b 100644 --- a/src/plugins/nullout/nullout.vcxproj +++ b/src/plugins/nullout/nullout.vcxproj @@ -275,6 +275,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -299,6 +300,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -323,6 +325,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -347,6 +350,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -370,6 +374,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -393,6 +398,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -420,6 +426,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -451,6 +458,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -482,6 +490,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -513,6 +522,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -543,6 +553,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -573,6 +584,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) diff --git a/src/plugins/server/server.vcxproj b/src/plugins/server/server.vcxproj index c04ad81f4..047e85b4c 100644 --- a/src/plugins/server/server.vcxproj +++ b/src/plugins/server/server.vcxproj @@ -237,6 +237,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) @@ -257,6 +258,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) @@ -277,6 +279,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) @@ -297,6 +300,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 ../../../../boost_1_74_0/lib64-msvc-14.2;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) @@ -312,6 +316,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 ../../../../boost_1_74_0/lib64-msvc-14.2;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) @@ -327,6 +332,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 ../../../../boost_1_74_0/lib64-msvc-14.2;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) @@ -348,6 +354,7 @@ Speed Sync true + stdcpp17 true @@ -378,6 +385,7 @@ Speed Sync true + stdcpp17 true @@ -408,6 +416,7 @@ Speed Sync true + stdcpp17 true @@ -435,6 +444,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 true @@ -455,6 +465,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 true @@ -475,6 +486,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;MHD_W32LIB;BUILDING_MHD_LIB;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 true diff --git a/src/plugins/stockencoders/stockencoders.vcxproj b/src/plugins/stockencoders/stockencoders.vcxproj index 70059d552..d8687d51d 100644 --- a/src/plugins/stockencoders/stockencoders.vcxproj +++ b/src/plugins/stockencoders/stockencoders.vcxproj @@ -237,6 +237,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 ../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) @@ -257,6 +258,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 ../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) @@ -277,6 +279,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreadedDebug true + stdcpp17 ../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) @@ -297,6 +300,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE MultiThreadedDebug true + stdcpp17 ../../3rdparty/bin/win64/lib @@ -312,6 +316,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE MultiThreadedDebug true + stdcpp17 ../../3rdparty/bin/win64/lib @@ -327,6 +332,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE MultiThreadedDebug true + stdcpp17 ../../3rdparty/bin/win64/lib @@ -348,6 +354,7 @@ Speed Sync true + stdcpp17 true @@ -378,6 +385,7 @@ Speed Sync true + stdcpp17 true @@ -408,6 +416,7 @@ Speed Sync true + stdcpp17 true @@ -434,6 +443,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 true @@ -453,6 +463,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 true @@ -472,6 +483,7 @@ WIN32;WIN32_LEAN_AND_MEAN;NOMINMAX;ZLIB_WINAPI;_SCL_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true + stdcpp17 true diff --git a/src/plugins/supereqdsp/supereqdsp.vcxproj b/src/plugins/supereqdsp/supereqdsp.vcxproj index 9c65d0b29..bbd8967dc 100644 --- a/src/plugins/supereqdsp/supereqdsp.vcxproj +++ b/src/plugins/supereqdsp/supereqdsp.vcxproj @@ -287,6 +287,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -311,6 +312,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -335,6 +337,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -359,6 +362,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -382,6 +386,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -405,6 +410,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 %(AdditionalDependencies) @@ -432,6 +438,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -463,6 +470,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -494,6 +502,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -525,6 +534,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -555,6 +565,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) @@ -585,6 +596,7 @@ Full Sync true + stdcpp17 %(AdditionalDependencies) diff --git a/src/plugins/taglib_plugin/taglib_plugin.vcxproj b/src/plugins/taglib_plugin/taglib_plugin.vcxproj index 6eef5ebf3..3664135c2 100755 --- a/src/plugins/taglib_plugin/taglib_plugin.vcxproj +++ b/src/plugins/taglib_plugin/taglib_plugin.vcxproj @@ -274,6 +274,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb true true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -305,6 +306,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb true true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -336,6 +338,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb true true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -367,6 +370,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb true true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -397,6 +401,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb true true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -427,6 +432,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb true true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -460,6 +466,7 @@ true Async true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -492,6 +499,7 @@ true Async true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -524,6 +532,7 @@ true Async true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -556,6 +565,7 @@ true Async true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -587,6 +597,7 @@ true Async true + stdcpp17 $(OutDir)$(ProjectName).dll @@ -618,6 +629,7 @@ true Async true + stdcpp17 $(OutDir)$(ProjectName).dll diff --git a/src/plugins/wasapiout/wasapiout.vcxproj b/src/plugins/wasapiout/wasapiout.vcxproj index 375227727..957bf927d 100644 --- a/src/plugins/wasapiout/wasapiout.vcxproj +++ b/src/plugins/wasapiout/wasapiout.vcxproj @@ -275,6 +275,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -299,6 +300,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -323,6 +325,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -347,6 +350,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -370,6 +374,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -393,6 +398,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -420,6 +426,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -451,6 +458,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -482,6 +490,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -513,6 +522,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -543,6 +553,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -573,6 +584,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) diff --git a/src/plugins/waveout/waveout.vcxproj b/src/plugins/waveout/waveout.vcxproj index 02455bbc1..76d0c13a1 100755 --- a/src/plugins/waveout/waveout.vcxproj +++ b/src/plugins/waveout/waveout.vcxproj @@ -275,6 +275,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -299,6 +300,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -323,6 +325,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -347,6 +350,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -370,6 +374,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -393,6 +398,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -420,6 +426,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -450,6 +457,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -480,6 +488,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -510,6 +519,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -539,6 +549,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -568,6 +579,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) diff --git a/src/plugins/win32gdivis/GdiVis-musikcube.vcxproj b/src/plugins/win32gdivis/GdiVis-musikcube.vcxproj index 7cac4f269..e2394f6d8 100644 --- a/src/plugins/win32gdivis/GdiVis-musikcube.vcxproj +++ b/src/plugins/win32gdivis/GdiVis-musikcube.vcxproj @@ -281,6 +281,7 @@ true Sync true + stdcpp17 true @@ -331,6 +332,7 @@ true Sync true + stdcpp17 true @@ -381,6 +383,7 @@ true Sync true + stdcpp17 true @@ -431,6 +434,7 @@ true Sync true + stdcpp17 true @@ -480,6 +484,7 @@ true Sync true + stdcpp17 true @@ -529,6 +534,7 @@ true Sync true + stdcpp17 true @@ -575,6 +581,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb EnableFastChecks true + stdcpp17 true @@ -622,6 +629,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb EnableFastChecks true + stdcpp17 true @@ -669,6 +677,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb EnableFastChecks true + stdcpp17 true @@ -715,6 +724,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb EnableFastChecks true + stdcpp17 true @@ -760,6 +770,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb EnableFastChecks true + stdcpp17 true @@ -805,6 +816,7 @@ $(IntDir)vc$(PlatformToolsetVersion).pdb EnableFastChecks true + stdcpp17 true diff --git a/src/plugins/win32globalhotkeys/win32globalhotkeys.vcxproj b/src/plugins/win32globalhotkeys/win32globalhotkeys.vcxproj index 69f4a6397..e0001eefd 100644 --- a/src/plugins/win32globalhotkeys/win32globalhotkeys.vcxproj +++ b/src/plugins/win32globalhotkeys/win32globalhotkeys.vcxproj @@ -275,6 +275,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -299,6 +300,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -323,6 +325,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -347,6 +350,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -370,6 +374,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -393,6 +398,7 @@ $(IntDir) $(IntDir)vc$(PlatformToolsetVersion).pdb true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -420,6 +426,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -450,6 +457,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -480,6 +488,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -510,6 +519,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -539,6 +549,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) @@ -568,6 +579,7 @@ Full Sync true + stdcpp17 winmm.lib;%(AdditionalDependencies) From 3685145f1d9c467d013279d2e395edcf6dc7d7bd Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 3 Dec 2022 16:19:01 -0800 Subject: [PATCH 2/8] Explicit library flags for vendor library builds. --- .cmake/CheckAtomic.cmake | 4 ++-- script/build-vendor-libraries.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cmake/CheckAtomic.cmake b/.cmake/CheckAtomic.cmake index 0cc051c3c..2a2e20b94 100644 --- a/.cmake/CheckAtomic.cmake +++ b/.cmake/CheckAtomic.cmake @@ -8,7 +8,7 @@ INCLUDE(CheckLibraryExists) function(check_working_cxx_atomics varname) set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) - set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++11") + set(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -std=c++17") CHECK_CXX_SOURCE_COMPILES(" #include std::atomic x; @@ -21,7 +21,7 @@ endfunction(check_working_cxx_atomics) function(check_working_cxx_atomics64 varname) set(OLD_CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS}) - set(CMAKE_REQUIRED_FLAGS "-std=c++11 ${CMAKE_REQUIRED_FLAGS}") + set(CMAKE_REQUIRED_FLAGS "-std=c++17 ${CMAKE_REQUIRED_FLAGS}") CHECK_CXX_SOURCE_COMPILES(" #include #include diff --git a/script/build-vendor-libraries.sh b/script/build-vendor-libraries.sh index e050990fe..b21858839 100755 --- a/script/build-vendor-libraries.sh +++ b/script/build-vendor-libraries.sh @@ -20,7 +20,7 @@ # export CFLAGS="-fPIC" -export CXXFLAGS="-fPIC" +export CXXFLAGS="-fPIC -std=c++17" RPATH="@rpath" @@ -106,7 +106,7 @@ function fetch_packages() { # function build_boost() { - BOOST_CXX_FLAGS="-fPIC" + BOOST_CXX_FLAGS="-fPIC -std=c++17" if [[ $OS == "Darwin" ]]; then BOOST_CXX_FLAGS="-fPIC -std=c++17 -stdlib=libc++" fi From 57d011e5312d2e82f81aef07d2cfa72f4c02d951 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 3 Dec 2022 16:25:09 -0800 Subject: [PATCH 3/8] Use cxx17 with boost builds. --- script/build-vendor-libraries.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/build-vendor-libraries.sh b/script/build-vendor-libraries.sh index b21858839..7d3fea789 100755 --- a/script/build-vendor-libraries.sh +++ b/script/build-vendor-libraries.sh @@ -124,7 +124,7 @@ function build_boost() { ./bootstrap.sh --with-libraries=atomic,chrono,date_time,filesystem,system,thread || exit $? ./b2 headers || exit $? - ./b2 -d ${JOBS} -sNO_LZMA=1 -sNO_ZSTD=1 ${BOOST_TOOLSET} threading=multi link=shared cxxflags="${BOOST_CXX_FLAGS}" --prefix=${OUTDIR} install || exit $? + ./b2 -d ${JOBS} -sNO_LZMA=1 -sNO_ZSTD=1 ${BOOST_TOOLSET} cxxstd=17 threading=multi link=shared cxxflags="${BOOST_CXX_FLAGS}" --prefix=${OUTDIR} install || exit $? cd .. } From a13d5ecb70ba445a2b009f7d515c5015f52cdb1e Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 3 Dec 2022 16:35:16 -0800 Subject: [PATCH 4/8] Fix boost version in scripts. --- CHANGELOG.txt | 1 + script/stage-vendor-libraries.sh | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 0b444801c..d932e9141 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -6,6 +6,7 @@ cycle. * updated Simplified Chinese translation (@UM-Li) * added Czech translation (@khagaroth) +* upgrade to c++-17 runtime -------------------------------------------------------------------------------- diff --git a/script/stage-vendor-libraries.sh b/script/stage-vendor-libraries.sh index 26d827547..6d7154fbe 100755 --- a/script/stage-vendor-libraries.sh +++ b/script/stage-vendor-libraries.sh @@ -45,12 +45,12 @@ elif [[ "$PLATFORM" == 'Linux' ]]; then cp vendor/bin/lib/libavformat-musikcube.so.59 ./bin/lib cp vendor/bin/lib/libavutil-musikcube.so.57 ./bin/lib cp vendor/bin/lib/libswresample-musikcube.so.4 ./bin/lib - cp vendor/bin/lib/libboost_atomic.so.1.79.0 ./bin/lib - cp vendor/bin/lib/libboost_chrono.so.1.79.0 ./bin/lib - cp vendor/bin/lib/libboost_date_time.so.1.79.0 ./bin/lib - cp vendor/bin/lib/libboost_filesystem.so.1.79.0 ./bin/lib - cp vendor/bin/lib/libboost_system.so.1.79.0 ./bin/lib - cp vendor/bin/lib/libboost_thread.so.1.79.0 ./bin/lib + cp vendor/bin/lib/libboost_atomic.so.1.80.0 ./bin/lib + cp vendor/bin/lib/libboost_chrono.so.1.80.0 ./bin/lib + cp vendor/bin/lib/libboost_date_time.so.1.80.0 ./bin/lib + cp vendor/bin/lib/libboost_filesystem.so.1.80.0 ./bin/lib + cp vendor/bin/lib/libboost_system.so.1.80.0 ./bin/lib + cp vendor/bin/lib/libboost_thread.so.1.80.0 ./bin/lib cp vendor/bin/lib/libcrypto.so.3 ./bin/lib cp vendor/bin/lib/libssl.so.3 ./bin/lib cp vendor/bin/lib/libcurl.so.4 ./bin/lib From 5dbd4f2dd801fbd02d144c7a2b335f6cc52593e8 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 3 Dec 2022 16:37:21 -0800 Subject: [PATCH 5/8] Fix libcyprto and ssl versions in scripts. --- script/stage-vendor-libraries.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/script/stage-vendor-libraries.sh b/script/stage-vendor-libraries.sh index 6d7154fbe..c554981ba 100755 --- a/script/stage-vendor-libraries.sh +++ b/script/stage-vendor-libraries.sh @@ -51,8 +51,8 @@ elif [[ "$PLATFORM" == 'Linux' ]]; then cp vendor/bin/lib/libboost_filesystem.so.1.80.0 ./bin/lib cp vendor/bin/lib/libboost_system.so.1.80.0 ./bin/lib cp vendor/bin/lib/libboost_thread.so.1.80.0 ./bin/lib - cp vendor/bin/lib/libcrypto.so.3 ./bin/lib - cp vendor/bin/lib/libssl.so.3 ./bin/lib + cp vendor/bin/lib/libcrypto.so.1.1 ./bin/lib + cp vendor/bin/lib/libssl.so.1.1 ./bin/lib cp vendor/bin/lib/libcurl.so.4 ./bin/lib cp vendor/bin/lib/libmp3lame.so.0 ./bin/lib cp vendor/bin/lib/libmicrohttpd.so.12 ./bin/lib From 783aedf665a2971dcf44b6874a0a00718c8321ed Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 3 Dec 2022 16:41:38 -0800 Subject: [PATCH 6/8] Separate staging and patching vendor library steps. --- script/archive-standalone-nix.sh | 2 ++ script/patch-vendor-libraries.sh | 25 +++++++++++++++++++++++++ script/stage-vendor-libraries.sh | 17 ----------------- 3 files changed, 27 insertions(+), 17 deletions(-) create mode 100644 script/patch-vendor-libraries.sh diff --git a/script/archive-standalone-nix.sh b/script/archive-standalone-nix.sh index d39ed6b9c..73fb51539 100755 --- a/script/archive-standalone-nix.sh +++ b/script/archive-standalone-nix.sh @@ -73,6 +73,8 @@ else make ${JOBS} || exit $? fi +./script/patch-vendor-libraries.sh || exit $? + rm -rf dist/$VERSION/*${OS_ARCH}_$VERSION* 2> /dev/null mkdir -p $OUTDIR/lib diff --git a/script/patch-vendor-libraries.sh b/script/patch-vendor-libraries.sh new file mode 100644 index 000000000..75350c439 --- /dev/null +++ b/script/patch-vendor-libraries.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +PLATFORM=$(uname) + +if [[ "$PLATFORM" == 'Linux' ]]; then + echo "[patch-static-vendor-libraries] patch Linux .so files..." + + # update the RPATH so libraries in libs/ can discover each other, + # and plugins can discover themselves, and libs/ (but not the + # other way around) + + FILES="./bin/lib/*" + for f in $FILES + do + patchelf --set-rpath "\$ORIGIN" "$f" + done + + FILES="./bin/plugins/*.so" + for f in $FILES + do + patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../lib" "$f" + done + + chmod -x ./bin/lib/* +fi diff --git a/script/stage-vendor-libraries.sh b/script/stage-vendor-libraries.sh index c554981ba..33e257c0c 100755 --- a/script/stage-vendor-libraries.sh +++ b/script/stage-vendor-libraries.sh @@ -77,21 +77,4 @@ elif [[ "$PLATFORM" == 'Linux' ]]; then mkdir -p ./bin/share/terminfo cp -rfp /lib/terminfo/* ./bin/share/terminfo - # update the RPATH so libraries in libs/ can discover each other, - # and plugins can discover themselves, and libs/ (but not the - # other way around) - - FILES="./bin/lib/*" - for f in $FILES - do - patchelf --set-rpath "\$ORIGIN" "$f" - done - - FILES="./bin/plugins/*.so" - for f in $FILES - do - patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../lib" "$f" - done - - chmod -x ./bin/lib/* fi From c33265ec49f8b0be05e5c8394218f52b1ca33460 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 3 Dec 2022 16:48:36 -0800 Subject: [PATCH 7/8] More rpath patching updates. --- script/archive-standalone-nix.sh | 3 ++- ...tch-vendor-libraries.sh => patch-linux-rpath.sh} | 0 script/patch-macos-rpath.sh | 13 +++++++++---- 3 files changed, 11 insertions(+), 5 deletions(-) rename script/{patch-vendor-libraries.sh => patch-linux-rpath.sh} (100%) mode change 100644 => 100755 diff --git a/script/archive-standalone-nix.sh b/script/archive-standalone-nix.sh index 73fb51539..3769b4ce1 100755 --- a/script/archive-standalone-nix.sh +++ b/script/archive-standalone-nix.sh @@ -73,7 +73,8 @@ else make ${JOBS} || exit $? fi -./script/patch-vendor-libraries.sh || exit $? +./script/patch-linux-rpath.sh || exit $? +./script/patch-macos-rpath.sh || exit $? rm -rf dist/$VERSION/*${OS_ARCH}_$VERSION* 2> /dev/null diff --git a/script/patch-vendor-libraries.sh b/script/patch-linux-rpath.sh old mode 100644 new mode 100755 similarity index 100% rename from script/patch-vendor-libraries.sh rename to script/patch-linux-rpath.sh diff --git a/script/patch-macos-rpath.sh b/script/patch-macos-rpath.sh index 032528f82..01b6f5e16 100755 --- a/script/patch-macos-rpath.sh +++ b/script/patch-macos-rpath.sh @@ -1,7 +1,12 @@ #!/bin/sh -install_name_tool -add_rpath "@executable_path/" bin/musikcube -install_name_tool -add_rpath "@executable_path/lib" bin/musikcube -install_name_tool -add_rpath "@executable_path/" bin/musikcubed -install_name_tool -add_rpath "@executable_path/lib" bin/musikcubed +PLATFORM=$(uname) + +if [[ "$PLATFORM" == 'Darwin' ]]; then + install_name_tool -add_rpath "@executable_path/" bin/musikcube + install_name_tool -add_rpath "@executable_path/lib" bin/musikcube + install_name_tool -add_rpath "@executable_path/" bin/musikcubed + install_name_tool -add_rpath "@executable_path/lib" bin/musikcubed +fi + exit 0 \ No newline at end of file From 1255a49bc053d5dba04f1b467bc66e120a1b9573 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sat, 3 Dec 2022 16:50:37 -0800 Subject: [PATCH 8/8] Logging updates. --- script/patch-linux-rpath.sh | 2 +- script/patch-macos-rpath.sh | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/script/patch-linux-rpath.sh b/script/patch-linux-rpath.sh index 75350c439..6a299dd58 100755 --- a/script/patch-linux-rpath.sh +++ b/script/patch-linux-rpath.sh @@ -3,7 +3,7 @@ PLATFORM=$(uname) if [[ "$PLATFORM" == 'Linux' ]]; then - echo "[patch-static-vendor-libraries] patch Linux .so files..." + echo "[patch-linux-rpath] patch Linux .so files..." # update the RPATH so libraries in libs/ can discover each other, # and plugins can discover themselves, and libs/ (but not the diff --git a/script/patch-macos-rpath.sh b/script/patch-macos-rpath.sh index 01b6f5e16..0d2e4f1de 100755 --- a/script/patch-macos-rpath.sh +++ b/script/patch-macos-rpath.sh @@ -1,8 +1,10 @@ -#!/bin/sh +#!/bin/bash PLATFORM=$(uname) if [[ "$PLATFORM" == 'Darwin' ]]; then + echo "[patch-macos-rpath] patch macOS binaries..." + install_name_tool -add_rpath "@executable_path/" bin/musikcube install_name_tool -add_rpath "@executable_path/lib" bin/musikcube install_name_tool -add_rpath "@executable_path/" bin/musikcubed