Fix _WIN32_WINNT version and provision

Signed-off-by: Sven Eden <sven@eden-worx.com>
Yamakuzure · Apr 14, 2023 · acc7e68 · acc7e68
1 parent fd2c227
commit acc7e68
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -135,8 +135,12 @@ configure_file(src/plugin-macros.h.in plugin-macros.generated.h)
 target_sources(obs-websocket PRIVATE plugin-macros.generated.h)
 
 target_compile_definitions(
-  obs-websocket PRIVATE ASIO_STANDALONE $<$<BOOL:PLUGIN_TESTS>:PLUGIN_TESTS>
-                        $<$<PLATFORM_ID:Windows>:_WEBSOCKETPP_CPP11_STL_> $<$<PLATFORM_ID:Windows>:_WIN32_WINNT=0x0603>)
+  obs-websocket
+  PRIVATE
+    ASIO_STANDALONE
+	$<$<BOOL:PLUGIN_TESTS>:PLUGIN_TESTS>
+    $<$<PLATFORM_ID:Windows>:_WEBSOCKETPP_CPP11_STL_>
+	$<$<PLATFORM_ID:Windows>:_WIN32_WINNT=0x0A00>)
 
 target_compile_options(
   obs-websocket

diff --git a/cmake/legacy.cmake b/cmake/legacy.cmake
@@ -154,7 +154,7 @@ endif()
 
 # Random other things
 if(WIN32)
-  add_definitions(-D_WEBSOCKETPP_CPP11_STL_)
+  add_definitions(-D_WEBSOCKETPP_CPP11_STL_ -D_WIN32_WINNT=0x0A00)
 endif()
 
 if(MSVC)

diff --git a/src/plugin-macros.h.in b/src/plugin-macros.h.in
@@ -18,6 +18,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 */
 
 #pragma once
+#ifndef SRC_PLUGIN_MACROS_GENERATED_H_INCLUDED
+#define SRC_PLUGIN_MACROS_GENERATED_H_INCLUDED 1
 
 #include <util/base.h>
 #ifndef _DEBUG
@@ -32,3 +34,5 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #define OBS_WEBSOCKET_RPC_VERSION @OBS_WEBSOCKET_RPC_VERSION@
 
 #define QT_TO_UTF8(str) str.toUtf8().constData()
+
+#endif // SRC_PLUGIN_MACROS_GENERATED_H_INCLUDED