diff --git a/Makefile b/Makefile
index b68a4f0..47b3d6d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,11 @@ MSYS_PATH ?= C:/MinGW/msys/1.0
OPENSSL_INC_DIR ?= C:/crpa/openssl/include
OPENSSL_LIB_DIR ?= C:/crpa/openssl
+# Print info
+$(info Discord Messenger makefile)
+$(info Debug: $(DEBUG))
+$(info Unicode: $(UNICODE))
+
USER_INC_DIRS =
USER_DEFINES =
@@ -49,7 +54,8 @@ DEFINES = \
-DASIO_IPROGS_THREADS \
-D_WEBSOCKETPP_IPROGS_THREAD_ \
-DMINGW_SPECIFIC_HACKS \
- -DASIO_DISABLE_WINDOWS_OBJECT_HANDLE
+ -DASIO_DISABLE_WINDOWS_OBJECT_HANDLE \
+ -DASIO_DISABLE_IOCP
ifeq ($(UNICODE), no)
UNICODE_DEF =
diff --git a/deps/asio/asio/detail/impl/win_event.ipp b/deps/asio/asio/detail/impl/win_event.ipp
index fd644b8..3012cde 100644
--- a/deps/asio/asio/detail/impl/win_event.ipp
+++ b/deps/asio/asio/detail/impl/win_event.ipp
@@ -32,10 +32,10 @@ win_event::win_event()
: state_(0)
{
#if defined(ASIO_WINDOWS_APP)
- events_[0] = ::CreateEventExW(0, 0,
+ events_[0] = ::CreateEventEx(0, 0,
CREATE_EVENT_MANUAL_RESET, EVENT_ALL_ACCESS);
#else // defined(ASIO_WINDOWS_APP)
- events_[0] = ::CreateEventW(0, true, false, 0);
+ events_[0] = ::CreateEvent(0, true, false, 0);
#endif // defined(ASIO_WINDOWS_APP)
if (!events_[0])
{
@@ -46,9 +46,9 @@ win_event::win_event()
}
#if defined(ASIO_WINDOWS_APP)
- events_[1] = ::CreateEventExW(0, 0, 0, EVENT_ALL_ACCESS);
+ events_[1] = ::CreateEventEx(0, 0, 0, EVENT_ALL_ACCESS);
#else // defined(ASIO_WINDOWS_APP)
- events_[1] = ::CreateEventW(0, false, false, 0);
+ events_[1] = ::CreateEvent(0, false, false, 0);
#endif // defined(ASIO_WINDOWS_APP)
if (!events_[1])
{
diff --git a/deps/asio/asio/detail/impl/win_mutex.ipp b/deps/asio/asio/detail/impl/win_mutex.ipp
index 14d2903..9757b8c 100644
--- a/deps/asio/asio/detail/impl/win_mutex.ipp
+++ b/deps/asio/asio/detail/impl/win_mutex.ipp
@@ -48,7 +48,8 @@ int win_mutex::do_init()
return ::GetLastError();
# else
if (!::InitializeCriticalSectionAndSpinCount(&crit_section_, 0x80000000))
- return ::GetLastError();
+ // just initialize it normally
+ ::InitializeCriticalSection(&crit_section_);
# endif
return 0;
#else
@@ -61,7 +62,8 @@ int win_mutex::do_init()
return ::GetLastError();
# else
if (!::InitializeCriticalSectionAndSpinCount(&crit_section_, 0x80000000))
- return ::GetLastError();
+ // just initialize it normally
+ ::InitializeCriticalSection(&crit_section_);
# endif
}
__except(GetExceptionCode() == STATUS_NO_MEMORY
diff --git a/vs/DiscordMessenger.sln b/vs/DiscordMessenger.sln
index 54516df..611210d 100644
--- a/vs/DiscordMessenger.sln
+++ b/vs/DiscordMessenger.sln
@@ -13,6 +13,8 @@ Global
DebugAnsi|x86 = DebugAnsi|x86
DebugAsan|x64 = DebugAsan|x64
DebugAsan|x86 = DebugAsan|x86
+ DebugNoIOCP|x64 = DebugNoIOCP|x64
+ DebugNoIOCP|x86 = DebugNoIOCP|x86
Release|x64 = Release|x64
Release|x86 = Release|x86
ReleaseAnsi|x64 = ReleaseAnsi|x64
@@ -31,6 +33,10 @@ Global
{3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.DebugAsan|x64.Build.0 = DebugAsan|x64
{3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.DebugAsan|x86.ActiveCfg = DebugAsan|Win32
{3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.DebugAsan|x86.Build.0 = DebugAsan|Win32
+ {3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.DebugNoIOCP|x64.ActiveCfg = DebugNoIOCP|x64
+ {3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.DebugNoIOCP|x64.Build.0 = DebugNoIOCP|x64
+ {3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.DebugNoIOCP|x86.ActiveCfg = DebugNoIOCP|Win32
+ {3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.DebugNoIOCP|x86.Build.0 = DebugNoIOCP|Win32
{3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.Release|x64.ActiveCfg = Release|x64
{3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.Release|x64.Build.0 = Release|x64
{3249EAC3-35D9-4646-ACE2-E2BD3B7F4812}.Release|x86.ActiveCfg = Release|Win32
diff --git a/vs/DiscordMessenger.vcxproj b/vs/DiscordMessenger.vcxproj
index b7a30e6..fb968cb 100644
--- a/vs/DiscordMessenger.vcxproj
+++ b/vs/DiscordMessenger.vcxproj
@@ -17,6 +17,14 @@
DebugAsan
x64
+
+ DebugNoIOCP
+ Win32
+
+
+ DebugNoIOCP
+ x64
+
Debug
Win32
@@ -57,6 +65,12 @@
v141_xp
Unicode
+
+ Application
+ true
+ v141_xp
+ Unicode
+
Application
true
@@ -90,6 +104,12 @@
v143
Unicode
+
+ Application
+ true
+ v143
+ Unicode
+
Application
true
@@ -124,6 +144,9 @@
+
+
+
@@ -139,6 +162,9 @@
+
+
+
@@ -157,6 +183,11 @@
false
obj\$(Configuration)\
+
+ $(SolutionDir)..\bin\$(Configuration)\
+ false
+ obj\$(Configuration)\
+
$(SolutionDir)..\bin\$(Configuration)\
false
@@ -195,6 +226,24 @@
true
+
+
+ Level3
+ true
+ ASIO_DISABLE_IOCP;USE_IPROGRAMS_TERMINATE;ASIO_DISABLE_WINDOWS_OBJECT_HANDLE;_WIN32_WINNT=0x0601;NOMINMAX;_CRT_SECURE_NO_WARNINGS;ASIO_SEPARATE_COMPILATION;ASIO_STANDALONE;_WEBSOCKETPP_CPP11_STL_;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ false
+ $(SolutionDir)..\deps;$(SolutionDir)..\deps\asio;$(SolutionDir)..\deps\mwas\include;$(OPENSSL_INSTALL)\include
+ true
+ false
+
+
+ Windows
+ true
+ $(SolutionDir)\libs;$(OPENSSL_INSTALL)\lib;$(OPENSSL_INSTALL);
+ libwebp.lib;libcrypto.lib;libssl.lib;ws2_32.lib;msimg32.lib;shlwapi.lib;comctl32.lib;comdlg32.lib;%(AdditionalDependencies)
+ true
+
+
Level3
@@ -285,6 +334,18 @@
true
+
+
+ Level3
+ true
+ _DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+
+
+ Console
+ true
+
+
Level3
@@ -466,6 +527,7 @@
+
@@ -499,7 +561,6 @@
-
diff --git a/vs/DiscordMessenger.vcxproj.filters b/vs/DiscordMessenger.vcxproj.filters
index d9714f7..791cd17 100644
--- a/vs/DiscordMessenger.vcxproj.filters
+++ b/vs/DiscordMessenger.vcxproj.filters
@@ -623,9 +623,6 @@
Header Files\Windows
-
- Header Files
-
Header Files\Discord
@@ -635,8 +632,11 @@
Header Files\Discord
-
- Header Files
+
+ Header Files\Windows
+
+
+ Source Files\Deps