From cd149ed167bf00598fa6b926efe9efe0948f5bfa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Sun, 1 Jun 2014 22:25:19 -0400
Subject: [PATCH] libwinpr-winsock: fix non-monolithic build

---
 winpr/libwinpr/winsock/CMakeLists.txt      | 4 ++++
 winpr/libwinpr/winsock/ModuleOptions.cmake | 3 +--
 winpr/libwinpr/winsock/module.def          | 3 +++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 winpr/libwinpr/winsock/module.def

diff --git a/winpr/libwinpr/winsock/CMakeLists.txt b/winpr/libwinpr/winsock/CMakeLists.txt
index 80e76a2e5..c4369c535 100644
--- a/winpr/libwinpr/winsock/CMakeLists.txt
+++ b/winpr/libwinpr/winsock/CMakeLists.txt
@@ -21,6 +21,10 @@ set(MODULE_PREFIX "WINPR_WINSOCK")
 set(${MODULE_PREFIX}_SRCS
 	winsock.c)
 
+if(MSVC AND (NOT MONOLITHIC_BUILD))
+	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS} module.def)
+endif()
+
 add_complex_library(MODULE ${MODULE_NAME} TYPE "OBJECT"
 	MONOLITHIC ${MONOLITHIC_BUILD}
 	SOURCES ${${MODULE_PREFIX}_SRCS}
diff --git a/winpr/libwinpr/winsock/ModuleOptions.cmake b/winpr/libwinpr/winsock/ModuleOptions.cmake
index 63275d0e1..af49b6e84 100644
--- a/winpr/libwinpr/winsock/ModuleOptions.cmake
+++ b/winpr/libwinpr/winsock/ModuleOptions.cmake
@@ -3,7 +3,6 @@ set(MINWIN_LAYER "0")
 set(MINWIN_GROUP "none")
 set(MINWIN_MAJOR_VERSION "0")
 set(MINWIN_MINOR_VERSION "0")
-set(MINWIN_SHORT_NAME "ws2_32")
+set(MINWIN_SHORT_NAME "winsock")
 set(MINWIN_LONG_NAME "Windows Sockets (Winsock)")
 set(MODULE_LIBRARY_NAME "${MINWIN_SHORT_NAME}")
-
diff --git a/winpr/libwinpr/winsock/module.def b/winpr/libwinpr/winsock/module.def
new file mode 100644
index 000000000..e4d0419ce
--- /dev/null
+++ b/winpr/libwinpr/winsock/module.def
@@ -0,0 +1,3 @@
+LIBRARY		"libwinpr-winsock"
+EXPORTS
+