Add utility to attach console under windows

[moonshot-ui.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 89fd2bb..7b64444 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -78,10 +78,12 @@ src_moonshot_webp_LDFLAGS =
 if OS_WIN32
 
 
+moonshot_LIBS += -lkernel32
+
 src_moonshot_CFLAGS = -mwindows
 src_moonshot_webp_CFLAGS = -mconsole
     
-AM_CPPFLAGS += -DOS_WIN32
+AM_CPPFLAGS += -DWINVER=0x0501 -DOS_WIN32
 AM_VALAFLAGS += --define=OS_WIN32
 
 # this is a gross hack to install the libmoonshot import lib in ${libdir}
@@ -232,7 +234,10 @@ if OS_WIN32
 ##    pulls in the icons required by moonshot and converts svg's to png's (we have
 ##    no svg support built in to Windows Gtk+ right now).
 
-icons:
+BUILT_ICONS = share/icons/avatar-default.png
+
+icons: $(BUILT_ICONS)
+$(BUILT_ICONS) :
        mkdir -p share/icons
        cp ${prefix}/share/icons/gnome/48x48/status/avatar-default.png share/icons
        "${IMAGEMAGICK_CONVERT}" -background none ${prefix}/share/icons/gnome/scalable/actions/edit-clear-symbolic.svg -size 13x13 share/icons/edit-clear-symbolic.png
@@ -242,14 +247,24 @@ icons:
 ## 2. Installer. You must have the Windows Installer XML toolkit version 3.5
 ##    installed in its default path. Note that this requires at least .NET
 ##    runtime with service packs 1 and 2. The installer picks up files from
-##    the build prefix and mingw dir; you must change these if you have them
-##    in different locations I'm afraid.
+##    the prefix, /usr, and /c/mingw directories.
 
 installer: moonshot.msi
 
-moonshot.msi: windows/app.wxs windows/config.wxi $(bin_PROGRAMS)
+moonshot.wixlib: windows/app.wxs windows/config.wxi $(bin_PROGRAMS) $(BUILT_ICONS)
        "${WIX_CANDLE}" $<
-       "${WIX_LIGHT}" -b ${prefix} -b /usr -b /c/mingw -o moonshot.msi app.wixobj
+       "${WIX_LIT}" -bf -b ${prefix} -b /usr -b /c/mingw -out moonshot.wixlib app.wixobj
+
+moonshot.msi: moonshot.wixlib
+       "${WIX_LIGHT}" -o moonshot.msi moonshot.wixlib
+
+## install moonshot.wixlib in libdir (/usr/local/lib)
+wixlibdir = ${libdir}
+wixlib_DATA = moonshot.wixlib
+
+## install moonshot.msi in bindir (/usr/local/bin)
+installerdir = ${bindir}
+installer_DATA = moonshot.msi
 
 endif