Skip to content

Commit dae1ab6

Browse files
kzhdevkzhdev
committed
update dependencies
1 parent bcbeebc commit dae1ab6

File tree

5 files changed

+46
-21
lines changed

5 files changed

+46
-21
lines changed

‎dependencies/slick_queue‎

‎zorro_websocket_proxy/src/zorro_websocket_proxy.cpp‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include <iostream>
66
#include <cstdio>
77
#include <ctime>
8-
8+
#include <string>
99
#include "websocket.h"
1010

1111
#define SHM_OWNER TEXT("ZorroWebsocketProxy_shm_owner")
@@ -62,7 +62,9 @@ namespace {
6262
wchar_t result[MAX_PATH] = { 0 };
6363
GetModuleFileNameW(NULL, result, MAX_PATH);
6464
std::wstring wsPath(result);
65-
std::string path(wsPath.begin(), wsPath.end());
65+
int count = WideCharToMultiByte(CP_ACP, 0, wsPath.c_str(), wsPath.length(), NULL, 0, NULL, NULL);
66+
std::string path(count, 0);
67+
WideCharToMultiByte(CP_ACP, 0, wsPath.c_str(), -1, &path[0], count, NULL, NULL);
6668
auto pos = path.rfind("\\");
6769
#else
6870
char result[PATH_MAX];

‎zorro_websocket_proxy/zorro_websocket_proxy.vcxproj‎

Lines changed: 29 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -29,26 +29,26 @@
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v142</PlatformToolset>
32+
<PlatformToolset>v143</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>Application</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v142</PlatformToolset>
38+
<PlatformToolset>v143</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>Application</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v142</PlatformToolset>
45+
<PlatformToolset>v143</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>Application</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v142</PlatformToolset>
51+
<PlatformToolset>v143</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>
@@ -76,26 +76,38 @@
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
7777
<LinkIncremental>false</LinkIncremental>
7878
</PropertyGroup>
79+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
80+
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
81+
</PropertyGroup>
82+
<PropertyGroup Label="Vcpkg">
83+
<VcpkgEnableManifest>false</VcpkgEnableManifest>
84+
</PropertyGroup>
85+
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86+
<VcpkgInstalledDir>..\..\..\..\vcpkg</VcpkgInstalledDir>
87+
</PropertyGroup>
7988
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
8089
<ClCompile>
8190
<WarningLevel>Level3</WarningLevel>
8291
<SDLCheck>true</SDLCheck>
8392
<PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8493
<ConformanceMode>true</ConformanceMode>
85-
<AdditionalIncludeDirectories>.\include;..\dependencies\slick_queue\include;..\dependencies\slicksocket\include;..\dependencies\slicksocket\include\lws;..\zorro_websocket_proxy_client\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
94+
<AdditionalIncludeDirectories>.\include;..\dependencies\slick_queue\include;..\dependencies\slicksocket\include;..\dependencies\slicksocket\include\lws;..\zorro_websocket_proxy_client\include;C:\Program Files (x86)\OpenSSL-Win32\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8695
<LanguageStandard>stdcpp17</LanguageStandard>
87-
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
96+
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
8897
</ClCompile>
8998
<Link>
9099
<SubSystem>Console</SubSystem>
91100
<GenerateDebugInformation>true</GenerateDebugInformation>
92-
<AdditionalDependencies>slicksocket.lib;%(AdditionalDependencies)</AdditionalDependencies>
93-
<AdditionalLibraryDirectories>../dependencies/slicksocket/lib/Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
101+
<AdditionalDependencies>slicksocket.lib;libcrypto.lib;libssl.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
102+
<AdditionalLibraryDirectories>../dependencies/slicksocket/lib/Debug;../dependencies/slicksocket/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
94103
</Link>
95104
<PostBuildEvent>
96-
<Command>copy $(ProjectDir)\..\dependencies\slicksocket\lib\libcrypto-1_1.dll $(OutDir)
97-
copy $(ProjectDir)\..\dependencies\slicksocket\lib\libssl-1_1.dll $(OutDir)
98-
copy $(ProjectDir)\..\dependencies\slicksocket\cert.pem $(OutDir)</Command>
105+
<Command>copy $(ProjectDir)..\dependencies\slicksocket\lib\libcrypto-3.dll $(OutDir)
106+
copy $(ProjectDir)..\dependencies\slicksocket\lib\libssl-3.dll $(OutDir)
107+
copy $(ProjectDir)..\dependencies\slicksocket\cert.pem $(OutDir)
108+
copy $(ProjectDir)..\dependencies\slicksocket\lib\uv.dll $(OutDir)
109+
copy $(ProjectDir)\..\dependencies\slicksocket\lib\websockets.dll $(OutDir)
110+
copy $(ProjectDir)\..\dependencies\slicksocket\lib\zlib1.dll $(OutDir)</Command>
99111
</PostBuildEvent>
100112
</ItemDefinitionGroup>
101113
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -115,12 +127,15 @@ copy $(ProjectDir)\..\dependencies\slicksocket\cert.pem $(OutDir)</Command>
115127
<EnableCOMDATFolding>true</EnableCOMDATFolding>
116128
<OptimizeReferences>true</OptimizeReferences>
117129
<GenerateDebugInformation>true</GenerateDebugInformation>
118-
<AdditionalDependencies>slicksocket.lib;%(AdditionalDependencies)</AdditionalDependencies>
119-
<AdditionalLibraryDirectories>../dependencies/slicksocket/lib/Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
130+
<AdditionalDependencies>slicksocket.lib;libcrypto.lib;libssl.lib;websockets.lib;%(AdditionalDependencies)</AdditionalDependencies>
131+
<AdditionalLibraryDirectories>../dependencies/slicksocket/lib/Release;../dependencies/slicksocket/lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
120132
</Link>
121133
<PostBuildEvent>
122134
<Command>copy $(ProjectDir)\..\dependencies\slicksocket\lib\libcrypto-1_1.dll $(OutDir)
123-
copy $(ProjectDir)\..\dependencies\slicksocket\lib\libssl-1_1.dll $(OutDir)</Command>
135+
copy $(ProjectDir)\..\dependencies\slicksocket\lib\libssl-1_1.dll $(OutDir)
136+
copy $(windir)\SysWOW64\msvcp140.dll $(OutDir)
137+
copy $(windir)\SysWOW64\vcruntime140.dll $(OutDir)
138+
copy $(windir)\SysWOW64\ucrtbase.dll $(OutDir)</Command>
124139
</PostBuildEvent>
125140
</ItemDefinitionGroup>
126141
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

‎zorro_websocket_proxy_client/include/types.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ namespace websocket {
1212
#define HEARTBEAT_INTERVAL 500 // 500ms
1313
#define HEARTBEAT_TIMEOUT 15000 // 15s
1414

15+
#pragma warning( push )
16+
#pragma warning( disable : 4200 )
17+
1518
#pragma pack(1)
1619
struct Message {
1720
enum Type : uint8_t {
@@ -87,6 +90,8 @@ namespace websocket {
8790
};
8891
#pragma pack()
8992

93+
#pragma warning( pop )
94+
9095
typedef slick::SlickQueue<uint8_t> SHM_QUEUE_T;
9196

9297
}

‎zorro_websocket_proxy_client/zorro_websocket_proxy_client.vcxproj‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,26 +30,27 @@
3030
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3131
<ConfigurationType>StaticLibrary</ConfigurationType>
3232
<UseDebugLibraries>true</UseDebugLibraries>
33-
<PlatformToolset>v142</PlatformToolset>
33+
<PlatformToolset>v143</PlatformToolset>
3434
<CharacterSet>Unicode</CharacterSet>
35+
<EnableASAN>false</EnableASAN>
3536
</PropertyGroup>
3637
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3738
<ConfigurationType>StaticLibrary</ConfigurationType>
3839
<UseDebugLibraries>false</UseDebugLibraries>
39-
<PlatformToolset>v142</PlatformToolset>
40+
<PlatformToolset>v143</PlatformToolset>
4041
<WholeProgramOptimization>true</WholeProgramOptimization>
4142
<CharacterSet>Unicode</CharacterSet>
4243
</PropertyGroup>
4344
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4445
<ConfigurationType>StaticLibrary</ConfigurationType>
4546
<UseDebugLibraries>true</UseDebugLibraries>
46-
<PlatformToolset>v142</PlatformToolset>
47+
<PlatformToolset>v143</PlatformToolset>
4748
<CharacterSet>Unicode</CharacterSet>
4849
</PropertyGroup>
4950
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
5051
<ConfigurationType>StaticLibrary</ConfigurationType>
5152
<UseDebugLibraries>false</UseDebugLibraries>
52-
<PlatformToolset>v142</PlatformToolset>
53+
<PlatformToolset>v143</PlatformToolset>
5354
<WholeProgramOptimization>true</WholeProgramOptimization>
5455
<CharacterSet>Unicode</CharacterSet>
5556
</PropertyGroup>
@@ -74,6 +75,7 @@
7475
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7576
<LinkIncremental>true</LinkIncremental>
7677
<TargetName>$(ProjectName)</TargetName>
78+
<IntDir>$(Configuration)\$(ProjectName)\</IntDir>
7779
</PropertyGroup>
7880
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
7981
<LinkIncremental>false</LinkIncremental>
@@ -99,6 +101,7 @@
99101
<AdditionalIncludeDirectories>.\;.\include;..\dependencies\slick_queue\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
100102
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
101103
<LanguageStandard>stdcpp17</LanguageStandard>
104+
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
102105
</ClCompile>
103106
<Link>
104107
<SubSystem>

0 commit comments

Comments
 (0)