teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

Revert "[Build] Fix for MSYS2 build while maintaining MSVC fix"

Browse Source 
This reverts commit faf1c416f3.
coverity_scan^2
David Cernat 8 years ago
parent 4b497a18c6
commit fb34e2c4ba
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File

8
cmake/FindRakNet.cmake
Unescape Escape View File

@ -54,22 +54,14 @@ IF(RakNet_FOUND)
IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE) IF (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG}) SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG})
IF(WIN32) IF(WIN32)
IF(MSVC)
SET(RakNet_LIBRARY optimized ${RakNet_LIBRARY_RELEASE} debug ${RakNet_LIBRARY_DEBUG} ws2_32.lib) 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) ENDIF(WIN32)
ELSE() ELSE()
# if there are no configuration types and CMAKE_BUILD_TYPE has no value # if there are no configuration types and CMAKE_BUILD_TYPE has no value
# then just use the release libraries # then just use the release libraries
SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} ) SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} )
IF(WIN32) IF(WIN32)
if(MSVC)
SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} ws2_32.lib) SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} ws2_32.lib)
ELSE()
SET(RakNet_LIBRARY ${RakNet_LIBRARY_RELEASE} -lws2_32)
ENDIF(MSVC)
ENDIF(WIN32) ENDIF(WIN32)
ENDIF() ENDIF()

Write Preview
Loading…
Cancel
Save