From bcd856d7b2ce71e2f9b718f79faccb335f812f42 Mon Sep 17 00:00:00 2001 From: Deve Date: Mon, 21 May 2018 21:23:45 +0200 Subject: [PATCH] Avoid not needed enet modification. Link needed libraries in cmake file in the same way as mingw build. --- lib/enet/CMakeLists.txt | 7 +------ lib/enet/win32.c | 3 --- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/enet/CMakeLists.txt b/lib/enet/CMakeLists.txt index dd79ae273..a7bd10926 100644 --- a/lib/enet/CMakeLists.txt +++ b/lib/enet/CMakeLists.txt @@ -21,11 +21,6 @@ add_library(enet STATIC win32.c ) -if(MINGW) +if(WIN32) target_link_libraries(enet wsock32 ws2_32 winmm) endif() - -#if(WIN32) -# find_library(WS2_LIBRARY NAMES "ws2_32" PATHS "C:/Windows/System32") -# target_link_libraries(enet ${WS2_LIBRARY}) -#endif() diff --git a/lib/enet/win32.c b/lib/enet/win32.c index 611077e2b..04c724665 100644 --- a/lib/enet/win32.c +++ b/lib/enet/win32.c @@ -8,9 +8,6 @@ #define ENET_BUILDING_LIB 1 #include "enet/enet.h" -#pragma comment(lib, "ws2_32.lib") -#pragma comment(lib, "winmm.lib") - static enet_uint32 timeBase = 0; int