From fb34e2c4ba16cfaa430280fe2939a8d85a267ed1 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Thu, 23 Feb 2017 02:29:25 +0200 Subject: [PATCH] Revert "[Build] Fix for MSYS2 build while maintaining MSVC fix" This reverts commit faf1c416f3f247d8f422937c84a7945abbe3ea70. --- cmake/FindRakNet.cmake | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/cmake/FindRakNet.cmake b/cmake/FindRakNet.cmake index 5441140c5..9f83cc641 100644 --- a/cmake/FindRakNet.cmake +++ b/cmake/FindRakNet.cmake @@ -54,22 +54,14 @@ IF(RakNet_FOUND) IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG}) IF(WIN32) - IF(MSVC) - SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG} ws2_32.lib) - ELSE() - SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG} -lws2_32) - ENDIF(MSVC) + SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG} ws2_32.lib) ENDIF(WIN32) ELSE() # if there are no configuration types and CMAKE_BUILD_TYPE has no value # then just use the release libraries SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} ) IF(WIN32) - if(MSVC) - SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} ws2_32.lib) - ELSE() - SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} -lws2_32) - ENDIF(MSVC) + SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} ws2_32.lib) ENDIF(WIN32) ENDIF()