From: Sam Thursfield <samthursfield@codethink.co.uk>
Date: Wed, 6 Jul 2011 15:28:53 +0000 (+0100)
Subject: client lib: don't link to GLib on Windows
X-Git-Tag: 0.7.1~205
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=moonshot-ui.git;a=commitdiff_plain;h=dc8051a39e03a64b1c6187ef9932a7210f5c336e

client lib: don't link to GLib on Windows

libmoonshot-0.dll now just depends on msrpc-mingw.dll
---

diff --git a/configure.ac b/configure.ac
index 9d31a97..4300ded 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,24 +24,26 @@ AC_CANONICAL_HOST
 case "$host" in
   *-*-mingw*)
     win32=yes
-    IPC_MODULE="msrpc-glib2-1.0"
+    SERVER_IPC_MODULE="msrpc-glib2-1.0"
+    CLIENT_IPC_MODULE="msrpc-mingw-1.0"
     ;;
   *)
     win32=no
-    IPC_MODULE="dbus-glib-1"
+    SERVER_IPC_MODULE="dbus-glib-1"
+    CLIENT_IPC_MODULE="dbus-glib-1"
     ;;
 esac
 
 AM_CONDITIONAL([OS_WIN32], [test "$win32" = "yes"])
-AM_CONDITIONAL([IPC_MSRPC], [test "$IPC_MODULE" = "msrpc-glib2-1.0"])
-AM_CONDITIONAL([IPC_DBUS], [test "$IPC_MODULE" = "dbus-glib-1"])
+AM_CONDITIONAL([IPC_MSRPC], [test "$SERVER_IPC_MODULE" = "msrpc-glib2-1.0"])
+AM_CONDITIONAL([IPC_DBUS], [test "$SERVER_IPC_MODULE" = "dbus-glib-1"])
 
 # Checks for programs.
 AC_PROG_CC
 AM_PROG_CC_C_O
 AM_PROG_VALAC([0.9])
 
-if test "$IPC_MODULE" = "msrpc-glib2-1.0"; then
+if test "$SERVER_IPC_MODULE" = "msrpc-glib2-1.0"; then
   # MS RPC utilities
   AC_PATH_MSRPC_MINGW([0.1.0], :,
     AC_MSG_ERROR([
@@ -114,11 +116,11 @@ PKG_CHECK_MODULES(moonshot,[
         glib-2.0 >= 2.24
         gobject-2.0 >= 2.24
         gtk+-2.0 >= 2.20
-        $IPC_MODULE
+        $SERVER_IPC_MODULE
 ])
 
 PKG_CHECK_MODULES(libmoonshot,[
-        $IPC_MODULE
+        $CLIENT_IPC_MODULE
 ])
 
 # i18n stuff
diff --git a/libmoonshot/libmoonshot-msrpc.c b/libmoonshot/libmoonshot-msrpc.c
index 44d1ef5..bfea62d 100644
--- a/libmoonshot/libmoonshot-msrpc.c
+++ b/libmoonshot/libmoonshot-msrpc.c
@@ -47,6 +47,13 @@
 #define MOONSHOT_ENDPOINT_NAME "/org/janet/Moonshot"
 #define MOONSHOT_INSTALL_PATH_KEY "Software\\Moonshot"
 
+void *__RPC_USER MIDL_user_allocate (size_t size) {
+	return malloc (size);
+}
+
+void __RPC_USER MIDL_user_free (void *data) {
+	free (data);
+}
 
 static MoonshotError *moonshot_error_new_from_status (MoonshotErrorCode code,
                                                       DWORD             status)