From db337f78a801e252ae0ad7f84d855a321260bf1a Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Thu, 19 May 2011 13:31:10 +0100 Subject: [PATCH] Enable Windows-specific compilation in Vala --- Makefile.am | 7 +++++++ configure.ac | 3 +++ 2 files changed, 10 insertions(+) diff --git a/Makefile.am b/Makefile.am index ca7e12f..4df40bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,6 +4,8 @@ SUBDIRS = po bin_PROGRAMS = src/moonshot +AM_CFLAGS = + AM_CPPFLAGS = \ -include config.h \ -DLOCALEDIR=\""$(localedir)"\" \ @@ -24,6 +26,11 @@ src_moonshot_SOURCES = \ src_moonshot_LDADD = \ $(moonshot_LIBS) +if OS_WIN32 +AM_CFLAGS += -mwindows +AM_VALAFLAGS += --define=OS_WIN32 +endif + if IPC_MSRPC AM_CPPFLAGS += -Isrc diff --git a/configure.ac b/configure.ac index 7282f2d..e92bb76 100644 --- a/configure.ac +++ b/configure.ac @@ -46,10 +46,12 @@ case "$host" in *** location and rerun configure.]) fi + win32=yes IPC_MODULE="msrpc-glib2-1.0" PKG_CHECK_MODULES(IPC, [msrpc-glib2-1.0]) ;; *) + win32=no IPC_MODULE="dbus-glib-1" PKG_CHECK_MODULES(IPC, [dbus-glib-1]) ;; @@ -57,6 +59,7 @@ esac AC_SUBST(MIDL) +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"]) -- 2.1.4