Skip to content

Commit 97013f6

Browse files
Vasyl-BaranVasylBaran
authored andcommitted
Change websocketpp to our fork
Update websocketpp to use our own (boost-free) fork Update submodule remove Add submodule Update websocketpp submodule Update submodule name Update websocketpp update websocketpp define only if it's not defined already
1 parent 1e835fe commit 97013f6

3 files changed

Lines changed: 8 additions & 5 deletions

File tree

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[submodule "other/json"]
22
path = other/json
33
url = https://github.com/nlohmann/json
4-
[submodule "other/websocketpp"]
5-
path = other/websocketpp
6-
url = https://github.com/zaphoyd/websocketpp
74
[submodule "other/asio"]
85
path = other/asio
96
url = https://github.com/chriskohlhoff/asio
7+
[submodule "other/logi_websocketpp"]
8+
path = other/websocketpp
9+
url = https://github.com/Logitech/logi_websocketpp

obs_plugin/src/obs_plugin.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22

33
#define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_
44
#define ASIO_STANDALONE
5-
#define _WEBSOCKETPP_CPP11_TYPE_TRAITS_
5+
6+
#ifndef _WEBSOCKETPP_CPP11_TYPE_TRAITS_
7+
#define _WEBSOCKETPP_CPP11_TYPE_TRAITS_
8+
#endif
69

710
#pragma warning(push)
811
#pragma warning(disable : 4267)

0 commit comments

Comments
 (0)