Merge branch 'master' into Next

TwinFan · May 15, 2024 · 2f2df35 · 2f2df35
2 parents ba02833 + 696b9e6
commit 2f2df35
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -326,7 +326,7 @@ endif ()
 
 if (WIN32)
     # Link platform-specific libraries especially for networking
-    target_link_libraries(LiveTraffic ws2_32.lib iphlpapi wldap32.lib advapi32.lib crypt32.lib opengl32 Normaliz)
+    target_link_libraries(LiveTraffic ws2_32.lib iphlpapi wldap32.lib advapi32.lib crypt32.lib opengl32 normaliz)
     if (MINGW)
         # Include MingW threads
         target_link_libraries(LiveTraffic mingw_stdthreads)

diff --git a/Lib/XPMP2 b/Lib/XPMP2
+1 −1		.github/workflows/build.yml
+3 −0		CMakeLists.txt
+2 −2		src/Network.h