Commit f499b34e authored by François Grisez's avatar François Grisez
Browse files

Merge branch '3.11.x'

parents 652ec4a5 79a8f905
...@@ -70,6 +70,9 @@ if(ENABLE_STATIC) ...@@ -70,6 +70,9 @@ if(ENABLE_STATIC)
else() else()
set(LINPHONE_LIBS_FOR_TOOLS linphone) set(LINPHONE_LIBS_FOR_TOOLS linphone)
endif() endif()
if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
list(APPEND LINPHONE_LIBS_FOR_TOOLS "Ws2_32")
endif()
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
......
...@@ -151,6 +151,9 @@ set(LIBS ...@@ -151,6 +151,9 @@ set(LIBS
${MEDIASTREAMER2_LIBRARIES} ${MEDIASTREAMER2_LIBRARIES}
${XML2_LIBRARIES} ${XML2_LIBRARIES}
) )
if(WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "WinddowsStore")
list(APPEND LIBS "Ws2_32")
endif()
if(ZLIB_FOUND) if(ZLIB_FOUND)
list(APPEND LIBS ${ZLIB_LIBRARIES}) list(APPEND LIBS ${ZLIB_LIBRARIES})
endif() endif()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment