From 97013f64f25e2cb76b3ca4f0bf0719f5697ffeb9 Mon Sep 17 00:00:00 2001 From: Vasyl Baran Date: Fri, 8 Mar 2024 11:03:14 +0200 Subject: [PATCH] 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 --- .gitmodules | 6 +++--- obs_plugin/src/obs_plugin.hpp | 5 ++++- other/websocketpp | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 2289f70..16c2ca7 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,9 +1,9 @@ [submodule "other/json"] path = other/json url = https://github.com/nlohmann/json -[submodule "other/websocketpp"] - path = other/websocketpp - url = https://github.com/zaphoyd/websocketpp [submodule "other/asio"] path = other/asio url = https://github.com/chriskohlhoff/asio +[submodule "other/logi_websocketpp"] + path = other/websocketpp + url = https://github.com/Logitech/logi_websocketpp diff --git a/obs_plugin/src/obs_plugin.hpp b/obs_plugin/src/obs_plugin.hpp index 7d7b7ce..513996e 100644 --- a/obs_plugin/src/obs_plugin.hpp +++ b/obs_plugin/src/obs_plugin.hpp @@ -2,7 +2,10 @@ #define _WEBSOCKETPP_CPP11_RANDOM_DEVICE_ #define ASIO_STANDALONE -#define _WEBSOCKETPP_CPP11_TYPE_TRAITS_ + +#ifndef _WEBSOCKETPP_CPP11_TYPE_TRAITS_ + #define _WEBSOCKETPP_CPP11_TYPE_TRAITS_ +#endif #pragma warning(push) #pragma warning(disable : 4267) diff --git a/other/websocketpp b/other/websocketpp index 56123c8..008d8e6 160000 --- a/other/websocketpp +++ b/other/websocketpp @@ -1 +1 @@ -Subproject commit 56123c87598f8b1dd471be83ca841ceae07f95ba +Subproject commit 008d8e6918c1f3efd7a80c3f1318d86651765814