fix ci

afwbkbc · Jul 7, 2024 · bf1d443 · bf1d443
1 parent 9a2d63f
commit bf1d443
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -69,7 +69,7 @@ IF ( VISUAL_STUDIO ) # (Provided in CMakePresets)
 	ADD_COMPILE_DEFINITIONS( VISUAL_STUDIO )
 ELSEIF ( WIN32 ) # probably mingw or github runner
 	TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PRIVATE wsock32 )
-	TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PRIVATE w2_s32 )
+	TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PRIVATE ws2_32 )
 ENDIF ()
 
 # needed for some uncommon IDE and OS combinations

diff --git a/src/env/Win32.h b/src/env/Win32.h
@@ -7,10 +7,12 @@
 #include <BaseTsd.h>
 typedef SSIZE_T ssize_t;
 #endif
+#if !defined(NOMINMAX)
 #define NOMINMAX
+#endif
 #define WIN32_LEAN_AND_MEAN
 
-#define _WINSOCKAPI_ 
+#define _WINSOCKAPI_
 #include <WinSock2.h> // TODO: check if compiles with mingw
 #include <windows.h>