summaryrefslogtreecommitdiffstats
path: root/libusbmuxd
diff options
context:
space:
mode:
authorGravatar Cerrato Renaud2010-06-10 10:41:30 +0200
committerGravatar Hector Martin2010-06-13 19:38:39 +0200
commit63ffaef5b9ba6225d2106f9d4ec07dd318163287 (patch)
tree20e27ae61fdce88281cba12b2423088e7befe935 /libusbmuxd
parent713cfb3d145f9db242138405f16d4ab225e8ba04 (diff)
downloadusbmuxd-63ffaef5b9ba6225d2106f9d4ec07dd318163287.tar.gz
usbmuxd-63ffaef5b9ba6225d2106f9d4ec07dd318163287.tar.bz2
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.
Diffstat (limited to 'libusbmuxd')
-rw-r--r--libusbmuxd/CMakeLists.txt1
-rw-r--r--libusbmuxd/libusbmuxd.c2
-rw-r--r--libusbmuxd/usbmuxd-proto.h2
3 files changed, 3 insertions, 2 deletions
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})
21set_target_properties(libusbmuxd PROPERTIES SOVERSION ${LIBUSBMUXD_SOVERSION}) 21set_target_properties(libusbmuxd PROPERTIES SOVERSION ${LIBUSBMUXD_SOVERSION})
22 22
23install(TARGETS libusbmuxd 23install(TARGETS libusbmuxd
24 RUNTIME DESTINATION bin
24 ARCHIVE DESTINATION lib${LIB_SUFFIX} 25 ARCHIVE DESTINATION lib${LIB_SUFFIX}
25 LIBRARY DESTINATION lib${LIB_SUFFIX} 26 LIBRARY DESTINATION lib${LIB_SUFFIX}
26) 27)
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)
83 */ 83 */
84static int connect_usbmuxd_socket() 84static int connect_usbmuxd_socket()
85{ 85{
86#ifdef WIN32 86#if defined(WIN32) || defined(__CYGWIN__)
87 return connect_socket("127.0.0.1", USBMUXD_SOCKET_PORT); 87 return connect_socket("127.0.0.1", USBMUXD_SOCKET_PORT);
88#else 88#else
89 return connect_unix_socket(USBMUXD_SOCKET_FILE); 89 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
28#include <stdint.h> 28#include <stdint.h>
29#define USBMUXD_PROTOCOL_VERSION 0 29#define USBMUXD_PROTOCOL_VERSION 0
30 30
31#ifdef WIN32 31#if defined(WIN32) || defined(__CYGWIN__)
32#define USBMUXD_SOCKET_PORT 27015 32#define USBMUXD_SOCKET_PORT 27015
33#else 33#else
34#define USBMUXD_SOCKET_FILE "/var/run/usbmuxd" 34#define USBMUXD_SOCKET_FILE "/var/run/usbmuxd"