summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Martin Szulecki2013-02-21 23:09:39 +0100
committerGravatar Martin Szulecki2013-02-21 23:09:39 +0100
commit4443e2fd95a71840109e7ca6d34f03e7c87dc6f8 (patch)
treebd625bc3943a0b2b5a3c7b4c9b9aa83081fe28ba
parent619daa992589ccfb4b44bdb4c74d5aadc7ad1f66 (diff)
downloadlibimobiledevice-4443e2fd95a71840109e7ca6d34f03e7c87dc6f8.tar.gz
libimobiledevice-4443e2fd95a71840109e7ca6d34f03e7c87dc6f8.tar.bz2
Link with ole32 on WIN32 to fix build
-rw-r--r--configure.ac16
-rw-r--r--src/Makefile.am5
2 files changed, 21 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 6c4722f..b60548f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,6 +67,22 @@ if test "x$ac_cv_have_endian" = "xno"; then
67 fi 67 fi
68fi 68fi
69 69
70# Check for operating system
71AC_MSG_CHECKING([whether to enable WIN32 build settings])
72case ${host_os} in
73 *mingw32*|*cygwin*)
74 win32=true
75 AC_MSG_RESULT([yes])
76 AC_CHECK_TOOL([WINDRES], [windres], AC_MSG_ERROR([windres not found]))
77 AC_SUBST(WINDRES)
78 ;;
79 *)
80 win32=false
81 AC_MSG_RESULT([no])
82 ;;
83esac
84AM_CONDITIONAL(WIN32, test x$win32 = xtrue)
85
70# Cython Python Bindings 86# Cython Python Bindings
71AC_ARG_WITH([cython], 87AC_ARG_WITH([cython],
72 [AS_HELP_STRING([--without-cython], 88 [AS_HELP_STRING([--without-cython],
diff --git a/src/Makefile.am b/src/Makefile.am
index f1f5f39..9186230 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -4,6 +4,7 @@ AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusbmuxd_CFLAGS) $(libgnutls_CFLAGS) $(libtasn1
4AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(libplist_LIBS) $(libusbmuxd_LIBS) $(libgcrypt_LIBS) ${libpthread_LIBS} $(openssl_LIBS) 4AM_LDFLAGS = $(libgnutls_LIBS) $(libtasn1_LIBS) $(libplist_LIBS) $(libusbmuxd_LIBS) $(libgcrypt_LIBS) ${libpthread_LIBS} $(openssl_LIBS)
5 5
6lib_LTLIBRARIES = libimobiledevice.la 6lib_LTLIBRARIES = libimobiledevice.la
7libimobiledevice_la_LIBADD =
7libimobiledevice_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIMOBILEDEVICE_SO_VERSION) -no-undefined 8libimobiledevice_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIMOBILEDEVICE_SO_VERSION) -no-undefined
8libimobiledevice_la_SOURCES = idevice.c idevice.h \ 9libimobiledevice_la_SOURCES = idevice.c idevice.h \
9 debug.c debug.h\ 10 debug.c debug.h\
@@ -25,3 +26,7 @@ libimobiledevice_la_SOURCES = idevice.c idevice.h \
25 misagent.c misagent.h\ 26 misagent.c misagent.h\
26 restore.c restore.h\ 27 restore.c restore.h\
27 diagnostics_relay.c diagnostics_relay.h 28 diagnostics_relay.c diagnostics_relay.h
29
30if WIN32
31libimobiledevice_la_LIBADD += -lole32
32endif \ No newline at end of file