From faf1c416f3f247d8f422937c84a7945abbe3ea70 Mon Sep 17 00:00:00 2001 From: Battlerax Date: Wed, 22 Feb 2017 16:22:05 -0600 Subject: [PATCH] [Build] Fix for MSYS2 build while maintaining MSVC fix --- cmake/FindRakNet.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/FindRakNet.cmake b/cmake/FindRakNet.cmake index 9f83cc641..5441140c5 100644 --- a/cmake/FindRakNet.cmake +++ b/cmake/FindRakNet.cmake @@ -54,14 +54,22 @@ IF(RakNet_FOUND) IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG}) IF(WIN32) - SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG} ws2_32.lib) + 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) 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) - SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} ws2_32.lib) + if(MSVC) + SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} ws2_32.lib) + ELSE() + SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} -lws2_32) + ENDIF(MSVC) ENDIF(WIN32) ENDIF()