From b91aa8770ab94196962b8f2bdb917b4486203653 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 4 Dec 2022 13:41:05 -0800 Subject: [PATCH] Update project files to use standalone asio for Windows build. --- src/core_c_demo/core_c_demo.vcxproj | 72 ++++++++++++------------ src/musikcore/library/Indexer.cpp | 10 ++-- src/musikcore/library/Indexer.h | 8 +-- src/musikcore/musikcore.vcxproj | 56 +++++++++--------- src/musikcore/net/PiggyWebSocketClient.h | 2 +- src/musikcore/net/RawWebSocketClient.cpp | 14 ++--- src/musikcore/net/RawWebSocketClient.h | 4 +- src/musikcore/net/WebSocketClient.h | 2 +- src/musikcube/musikcube.vcxproj | 72 ++++++++++++------------ src/musikcube/stdafx.h | 2 +- src/plugins/server/server.vcxproj | 72 ++++++++++++------------ 11 files changed, 157 insertions(+), 157 deletions(-) diff --git a/src/core_c_demo/core_c_demo.vcxproj b/src/core_c_demo/core_c_demo.vcxproj index 026f321ed..140ae0873 100644 --- a/src/core_c_demo/core_c_demo.vcxproj +++ b/src/core_c_demo/core_c_demo.vcxproj @@ -272,8 +272,8 @@ Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -288,7 +288,7 @@ stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -313,8 +313,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -330,7 +330,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;$(OutputPath);%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;$(OutputPath);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -355,8 +355,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -372,7 +372,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -397,8 +397,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug NotUsing @@ -412,7 +412,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -436,8 +436,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug NotUsing @@ -452,7 +452,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;$(OutputPath);%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;$(OutputPath);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -476,8 +476,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug NotUsing @@ -492,7 +492,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -515,8 +515,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded NotUsing Level3 @@ -534,7 +534,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Console @@ -562,8 +562,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded NotUsing Level3 @@ -582,7 +582,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;$(OutputPath);%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;$(OutputPath);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Console @@ -610,8 +610,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded NotUsing Level3 @@ -630,7 +630,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Console @@ -658,8 +658,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded NotUsing Level3 @@ -677,7 +677,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Console @@ -704,8 +704,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded NotUsing Level3 @@ -724,7 +724,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;$(OutputPath);%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;$(OutputPath);%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Console @@ -751,8 +751,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) MultiThreaded NotUsing Level3 @@ -771,7 +771,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Console diff --git a/src/musikcore/library/Indexer.cpp b/src/musikcore/library/Indexer.cpp index 28f02f37a..94b65350f 100644 --- a/src/musikcore/library/Indexer.cpp +++ b/src/musikcore/library/Indexer.cpp @@ -225,7 +225,7 @@ void Indexer::RemovePath(const std::string& path) { } } -void Indexer::Synchronize(const SyncContext& context, boost::asio::io_service* io) { +void Indexer::Synchronize(const SyncContext& context, asio::io_service* io) { LocalLibrary::CreateIndexes(this->dbConnection); IndexerTrack::OnIndexerStarted(this->dbConnection); @@ -354,7 +354,7 @@ void Indexer::FinalizeSync(const SyncContext& context) { } void Indexer::ReadMetadataFromFile( - boost::asio::io_service* io, + asio::io_service* io, const std::fs::path& file, const std::string& pathId) { @@ -457,7 +457,7 @@ inline void Indexer::IncrementTracksScanned(int delta) { } void Indexer::SyncDirectory( - boost::asio::io_service* io, + asio::io_service* io, const std::string &syncRoot, const std::string ¤tPath, int64_t pathId) @@ -626,8 +626,8 @@ void Indexer::ThreadLoop() { prefs::keys::IndexerThreadCount, DEFAULT_MAX_THREADS); if (threadCount > 1) { - boost::asio::io_service io; - boost::asio::io_service::work work(io); + asio::io_service io; + asio::io_service::work work(io); ThreadGroup threadGroup; /* initialize the thread pool -- we'll use this to index tracks in parallel. */ diff --git a/src/musikcore/library/Indexer.h b/src/musikcore/library/Indexer.h index 572fc17e2..82ea69c85 100644 --- a/src/musikcore/library/Indexer.h +++ b/src/musikcore/library/Indexer.h @@ -45,7 +45,7 @@ #pragma warning(push, 0) #include -#include +#include #pragma warning(pop) #include @@ -122,7 +122,7 @@ namespace musik { namespace core { void ThreadLoop(); - void Synchronize(const SyncContext& context, boost::asio::io_service* io); + void Synchronize(const SyncContext& context, asio::io_service* io); void FinalizeSync(const SyncContext& context); @@ -145,13 +145,13 @@ namespace musik { namespace core { void IncrementTracksScanned(int delta = 1); void SyncDirectory( - boost::asio::io_service* io, + asio::io_service* io, const std::string& syncRoot, const std::string& currentPath, int64_t pathId); void ReadMetadataFromFile( - boost::asio::io_service* io, + asio::io_service* io, const std::filesystem::path& path, const std::string& pathId); diff --git a/src/musikcore/musikcore.vcxproj b/src/musikcore/musikcore.vcxproj index e3409fed4..5a73facf5 100644 --- a/src/musikcore/musikcore.vcxproj +++ b/src/musikcore/musikcore.vcxproj @@ -247,8 +247,8 @@ Disabled - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -268,8 +268,8 @@ Disabled - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -287,14 +287,14 @@ libcurl.lib;libssl-1_1.lib;libcrypto-1_1.lib;%(AdditionalDependencies) - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) Disabled - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -314,8 +314,8 @@ Disabled - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -334,8 +334,8 @@ Disabled - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -352,14 +352,14 @@ libcurl.lib;libssl-1_1-x64.lib;libcrypto-1_1-x64.lib;%(AdditionalDependencies) - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) Disabled - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -381,8 +381,8 @@ Default true Speed - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) MultiThreaded Use pch.hpp @@ -403,8 +403,8 @@ Default true Speed - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) MultiThreaded Use pch.hpp @@ -420,7 +420,7 @@ libcurl.lib;libssl-1_1.lib;libcrypto-1_1.lib;%(AdditionalDependencies) - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) @@ -429,8 +429,8 @@ Default true Speed - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) MultiThreaded Use pch.hpp @@ -451,8 +451,8 @@ Default true Speed - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) MultiThreaded Use pch.hpp @@ -473,8 +473,8 @@ Default true Speed - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) MultiThreaded Use pch.hpp @@ -490,7 +490,7 @@ libcurl.lib;libssl-1_1-x64.lib;libcrypto-1_1-x64.lib;%(AdditionalDependencies) - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) @@ -499,8 +499,8 @@ Default true Speed - ./;../;../3rdparty/include/;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) + ./;../;../3rdparty/include/;../3rdparty/win32_include;../3rdparty/asio/asio/include/;%(AdditionalIncludeDirectories) + WIN32;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_CRT_SECURE_NO_DEPRECATE;MCSDK_DEFINE_EXPORTS;%(PreprocessorDefinitions) MultiThreaded Use pch.hpp diff --git a/src/musikcore/net/PiggyWebSocketClient.h b/src/musikcore/net/PiggyWebSocketClient.h index 4456cb6d9..429ef0265 100644 --- a/src/musikcore/net/PiggyWebSocketClient.h +++ b/src/musikcore/net/PiggyWebSocketClient.h @@ -104,7 +104,7 @@ namespace musik { namespace core { namespace net { ClientPtr rawClient; Connection connection; std::string sessionId; - boost::asio::io_service io; + asio::io_service io; std::unique_ptr thread; mutable std::recursive_mutex mutex; bool useTls{ false }; diff --git a/src/musikcore/net/RawWebSocketClient.cpp b/src/musikcore/net/RawWebSocketClient.cpp index 19f6893e8..9404046a4 100644 --- a/src/musikcore/net/RawWebSocketClient.cpp +++ b/src/musikcore/net/RawWebSocketClient.cpp @@ -41,14 +41,14 @@ using namespace musik::core::net; static inline RawWebSocketClient::SslContext createSslContext() { RawWebSocketClient::SslContext ctx = - std::make_shared(boost::asio::ssl::context::sslv23); + std::make_shared(asio::ssl::context::sslv23); try { - ctx->set_options(boost::asio::ssl::context::default_workarounds | - boost::asio::ssl::context::no_sslv2 | - boost::asio::ssl::context::no_sslv3 | - boost::asio::ssl::context::single_dh_use | - boost::asio::ssl::context::verify_none); + ctx->set_options(asio::ssl::context::default_workarounds | + asio::ssl::context::no_sslv2 | + asio::ssl::context::no_sslv3 | + asio::ssl::context::single_dh_use | + asio::ssl::context::verify_none); } catch (std::exception& e) { std::cerr << "Error in context pointer: " << e.what() << std::endl; @@ -56,7 +56,7 @@ static inline RawWebSocketClient::SslContext createSslContext() { return ctx; } -RawWebSocketClient::RawWebSocketClient(boost::asio::io_service& io) { +RawWebSocketClient::RawWebSocketClient(asio::io_service& io) { websocketpp::lib::error_code ec; plainTextClient = std::make_unique(); diff --git a/src/musikcore/net/RawWebSocketClient.h b/src/musikcore/net/RawWebSocketClient.h index feced2ad2..6fe74005a 100644 --- a/src/musikcore/net/RawWebSocketClient.h +++ b/src/musikcore/net/RawWebSocketClient.h @@ -55,7 +55,7 @@ namespace musik { namespace core { namespace net { using PlainTextClientPtr = std::unique_ptr; using TlsClient = websocketpp::client; using TlsClientPtr = std::unique_ptr; - using SslContext = std::shared_ptr; + using SslContext = std::shared_ptr; using Message = websocketpp::config::asio_client::message_type::ptr; using Connection = websocketpp::connection_hdl; @@ -70,7 +70,7 @@ namespace musik { namespace core { namespace net { TLS = 1 }; - RawWebSocketClient(boost::asio::io_service& io); + RawWebSocketClient(asio::io_service& io); RawWebSocketClient(const RawWebSocketClient&) = delete; ~RawWebSocketClient(); diff --git a/src/musikcore/net/WebSocketClient.h b/src/musikcore/net/WebSocketClient.h index ffaacb3f0..67d634c1d 100644 --- a/src/musikcore/net/WebSocketClient.h +++ b/src/musikcore/net/WebSocketClient.h @@ -123,7 +123,7 @@ namespace musik { namespace core { namespace net { ClientPtr rawClient; Connection connection; - boost::asio::io_service io; + asio::io_service io; std::unique_ptr thread; mutable std::recursive_mutex mutex; bool useTls{ false }; diff --git a/src/musikcube/musikcube.vcxproj b/src/musikcube/musikcube.vcxproj index 4de9bac25..70071bd72 100755 --- a/src/musikcube/musikcube.vcxproj +++ b/src/musikcube/musikcube.vcxproj @@ -280,8 +280,8 @@ Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -297,7 +297,7 @@ stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Windows @@ -327,8 +327,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -344,7 +344,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Windows @@ -374,8 +374,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -391,7 +391,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -421,8 +421,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -437,7 +437,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Windows @@ -466,8 +466,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -482,7 +482,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Windows @@ -511,8 +511,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e Disabled - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;_DEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug Use @@ -527,7 +527,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/debug;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) true Console @@ -555,8 +555,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) MultiThreaded Use Level3 @@ -575,7 +575,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Windows @@ -608,8 +608,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) MultiThreaded Use Level3 @@ -628,7 +628,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Windows @@ -661,8 +661,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) MultiThreaded Use Level3 @@ -681,7 +681,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib32-msvc-14.2;../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win32/lib;../3rdparty/bin/win32/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Console @@ -714,8 +714,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) MultiThreaded Use Level3 @@ -734,7 +734,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Windows @@ -766,8 +766,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINGUI;%(PreprocessorDefinitions) MultiThreaded Use Level3 @@ -786,7 +786,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Windows @@ -818,8 +818,8 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e - ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../../../boost_1_74_0;%(AdditionalIncludeDirectories) - WIN32;CURL_STATICLIB;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) + ./;../;./cursespp;../3rdparty/include;../3rdparty/win32_include;../3rdparty/asio/asio/include;%(AdditionalIncludeDirectories) + WIN32;CURL_STATICLIB;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;_WEBSOCKETPP_CPP11_RANDOM_DEVICE_;ASIO_STANDALONE;NDEBUG;_CONSOLE;_SCL_SECURE_NO_WARNINGS;PDCURSES_WINCON;%(PreprocessorDefinitions) MultiThreaded Use Level3 @@ -838,7 +838,7 @@ xcopy "$(SolutionDir)src\3rdparty\bin\win\font\*.ttf" "$(TargetDir)fonts\" /Y /e stdcpp17 - ../../../boost_1_74_0/lib64-msvc-14.2;../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) + ../3rdparty/bin/win64/lib;../3rdparty/bin/win64/lib/release;%(AdditionalLibraryDirectories) %(IgnoreSpecificDefaultLibraries) false Console diff --git a/src/musikcube/stdafx.h b/src/musikcube/stdafx.h index 5ab4c0117..96cd0769d 100644 --- a/src/musikcube/stdafx.h +++ b/src/musikcube/stdafx.h @@ -52,7 +52,7 @@ /* curses defines a timeout() method that causes issues with asio's streambuf. include it up front so work around this */ #pragma warning(push, 0) -#include +#include #pragma warning(pop) #include diff --git a/src/plugins/server/server.vcxproj b/src/plugins/server/server.vcxproj index 047e85b4c..e19d2755f 100644 --- a/src/plugins/server/server.vcxproj +++ b/src/plugins/server/server.vcxproj @@ -233,14 +233,14 @@ Level3 Disabled true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) - 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) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreadedDebug true stdcpp17 - ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) + ../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) zlibstatD.lib;%(AdditionalDependencies) false @@ -254,14 +254,14 @@ Level3 Disabled true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) - 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) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreadedDebug true stdcpp17 - ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) + ../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) zlibstatD.lib;%(AdditionalDependencies) false @@ -275,14 +275,14 @@ Level3 Disabled true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) - 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) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreadedDebug true stdcpp17 - ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) + ../../3rdparty/bin/win32/lib;%(AdditionalLibraryDirectories) zlibstatD.lib;%(AdditionalDependencies) false @@ -296,14 +296,14 @@ Level3 Disabled true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) - 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) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreadedDebug true stdcpp17 - ../../../../boost_1_74_0/lib64-msvc-14.2;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + ;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) zlibstatD.lib;%(AdditionalDependencies) @@ -312,14 +312,14 @@ Level3 Disabled true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) - 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) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreadedDebug true stdcpp17 - ../../../../boost_1_74_0/lib64-msvc-14.2;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + ;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) zlibstatD.lib;%(AdditionalDependencies) @@ -328,14 +328,14 @@ Level3 Disabled true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) - 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) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreadedDebug true stdcpp17 - ../../../../boost_1_74_0/lib64-msvc-14.2;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + ;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) zlibstatD.lib;%(AdditionalDependencies) @@ -346,8 +346,8 @@ true true true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) - 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) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreaded None Default @@ -359,7 +359,7 @@ true true - ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib + ../../3rdparty/bin/win32/lib zlibstat.lib;%(AdditionalDependencies) false Windows @@ -377,8 +377,8 @@ true true true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) - 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) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreaded None Default @@ -390,7 +390,7 @@ true true - ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib + ../../3rdparty/bin/win32/lib zlibstat.lib;%(AdditionalDependencies) false Windows @@ -408,8 +408,8 @@ true true true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) - 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) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreaded None Default @@ -421,7 +421,7 @@ true true - ../../../../boost_1_74_0/lib32-msvc-14.2;../../3rdparty/bin/win32/lib + ../../3rdparty/bin/win32/lib zlibstat.lib;%(AdditionalDependencies) false Windows @@ -439,9 +439,9 @@ true true true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) None - 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) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreaded true stdcpp17 @@ -449,7 +449,7 @@ true true - ../../../../boost_1_74_0/lib64-msvc-14.2;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + ;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) zlibstatD.lib;%(AdditionalDependencies) @@ -460,9 +460,9 @@ true true true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) None - 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) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreaded true stdcpp17 @@ -470,7 +470,7 @@ true true - ../../../../boost_1_74_0/lib64-msvc-14.2;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + ;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) zlibstatD.lib;%(AdditionalDependencies) @@ -481,9 +481,9 @@ true true true - ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../../../boost_1_74_0;../../;%(AdditionalIncludeDirectories) + ../../3rdparty/include;../../3rdparty/win32_include;../../../../3rdparty/win32_include;../../3rdparty/asio/asio/include;../../;%(AdditionalIncludeDirectories) None - 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) + 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;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_WEBSOCKETPP_CPP11_TYPE_TRAITS_;ASIO_STANDALONE;%(PreprocessorDefinitions) MultiThreaded true stdcpp17 @@ -491,7 +491,7 @@ true true - ../../../../boost_1_74_0/lib64-msvc-14.2;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) + ;../../3rdparty/bin/win64/lib;%(AdditionalLibraryDirectories) zlibstatD.lib;%(AdditionalDependencies)