From 63ffaef5b9ba6225d2106f9d4ec07dd318163287 Mon Sep 17 00:00:00 2001
From: Cerrato Renaud
Date: Thu, 10 Jun 2010 10:41:30 +0200
Subject: Fix cygwin builds
- libusbmuxd/CMakeLists.txt : there was a neglect into install rules, for DLL, RUNTIME was missing.
- libusbmuxd.c : added __CYGWIN__ conditionnal compilation checks to force regular socket instead of UNIX sockets on CYGWIN platform.
---
libusbmuxd/CMakeLists.txt | 1 +
libusbmuxd/libusbmuxd.c | 2 +-
libusbmuxd/usbmuxd-proto.h | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
(limited to 'libusbmuxd')
diff --git a/libusbmuxd/CMakeLists.txt b/libusbmuxd/CMakeLists.txt
index 6bded04..c8f2cb4 100644
--- a/libusbmuxd/CMakeLists.txt
+++ b/libusbmuxd/CMakeLists.txt
@@ -21,6 +21,7 @@ set_target_properties(libusbmuxd PROPERTIES VERSION ${LIBUSBMUXD_VERSION})
set_target_properties(libusbmuxd PROPERTIES SOVERSION ${LIBUSBMUXD_SOVERSION})
install(TARGETS libusbmuxd
+ RUNTIME DESTINATION bin
ARCHIVE DESTINATION lib${LIB_SUFFIX}
LIBRARY DESTINATION lib${LIB_SUFFIX}
)
diff --git a/libusbmuxd/libusbmuxd.c b/libusbmuxd/libusbmuxd.c
index 564adcb..bb30c04 100644
--- a/libusbmuxd/libusbmuxd.c
+++ b/libusbmuxd/libusbmuxd.c
@@ -83,7 +83,7 @@ static usbmuxd_device_info_t *devices_find(int handle)
*/
static int connect_usbmuxd_socket()
{
-#ifdef WIN32
+#if defined(WIN32) || defined(__CYGWIN__)
return connect_socket("127.0.0.1", USBMUXD_SOCKET_PORT);
#else
return connect_unix_socket(USBMUXD_SOCKET_FILE);
diff --git a/libusbmuxd/usbmuxd-proto.h b/libusbmuxd/usbmuxd-proto.h
index 11dd3cf..390cd3d 100644
--- a/libusbmuxd/usbmuxd-proto.h
+++ b/libusbmuxd/usbmuxd-proto.h
@@ -28,7 +28,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
#include <stdint.h>
#define USBMUXD_PROTOCOL_VERSION 0
-#ifdef WIN32
+#if defined(WIN32) || defined(__CYGWIN__)
#define USBMUXD_SOCKET_PORT 27015
#else
#define USBMUXD_SOCKET_FILE "/var/run/usbmuxd"
--
cgit v1.1-32-gdbae