From 1d1df30bda35010b25479af38dd792805fae83de Mon Sep 17 00:00:00 2001
From: Nicola Fontana <ntd@entidi.it>
Date: Wed, 14 Aug 2013 21:50:32 +0200
Subject: [PATCH] build: improved win32/win64 installer

Took some advices from the ntdisp project for the windows installers:
included libgcc and the (old missing) bzip2 DLLs and modified
configure.ac accordingly.
---
 build/adg.nsi.in |  9 ++++++++-
 configure.ac     | 11 +++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/build/adg.nsi.in b/build/adg.nsi.in
index 3b37ff99..e2ab9bfd 100644
--- a/build/adg.nsi.in
+++ b/build/adg.nsi.in
@@ -5,7 +5,8 @@
 
 !define SRCDIR      "@abs_top_srcdir@"
 !define BUILDDIR    "@abs_top_builddir@"
-!define DLLDIR      "@DLLDIR@"
+!define USRDIR      "@USRDIR@"
+!define DLLDIR      "${USRDIR}/bin"
 
 ; ---------------------------------------------------------------
 ; 1. Header file
@@ -81,7 +82,9 @@ Section "ADG canvas" SecBase
   File "${SRCDIR}/demo/adg-128.png"
 
   SetOutPath "$INSTDIR\bin"
+  File "${USRDIR}/lib/libgcc_s_*-1.dll"
   File "${DLLDIR}/zlib1.dll"
+  File "${DLLDIR}/libbz2-*.dll"
   File "${DLLDIR}/libexpat-*.dll"
   File "${DLLDIR}/libintl-*.dll"
   File "${DLLDIR}/iconv.dll"
@@ -92,6 +95,7 @@ Section "ADG canvas" SecBase
   File "${DLLDIR}/libgmodule-2.0-*.dll"
   File "${DLLDIR}/libgobject-2.0-*.dll"
   File "${DLLDIR}/libgio-2.0-*.dll"
+  File "${DLLDIR}/libfreetype-*.dll"
   File "${DLLDIR}/libpixman-1-*.dll"
   File "${DLLDIR}/libcairo-*.dll"
   File "${DLLDIR}/libpango-1.0-*.dll"
@@ -149,6 +153,7 @@ Section "Uninstall"
   Delete "$INSTDIR\bin\libpango-1.0-*.dll"
   Delete "$INSTDIR\bin\libcairo-*.dll"
   Delete "$INSTDIR\bin\libpixman-1-*.dll"
+  Delete "$INSTDIR\bin\libfreetype-*.dll"
   Delete "$INSTDIR\bin\libgio-2.0-*.dll"
   Delete "$INSTDIR\bin\libgobject-2.0-*.dll"
   Delete "$INSTDIR\bin\libgmodule-2.0-*.dll"
@@ -159,7 +164,9 @@ Section "Uninstall"
   Delete "$INSTDIR\bin\iconv.dll"
   Delete "$INSTDIR\bin\libintl-*.dll"
   Delete "$INSTDIR\bin\libexpat-*.dll"
+  Delete "$INSTDIR\bin\libbz2-*.dll"
   Delete "$INSTDIR\bin\zlib1.dll"
+  Delete "$INSTDIR\bin\libgcc_s_*-1.dll"
   Delete "$INSTDIR\bin\libcpml-1-*.dll"
   Delete "$INSTDIR\bin\libadg-1-*.dll"
   RMDir  "$INSTDIR\bin"
diff --git a/configure.ac b/configure.ac
index a78fa7c2..b6153e1c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -297,12 +297,11 @@ AC_C_CONST
 
 # Windows substitutions for NSis installer
 
-dnl By default DLLDIR is set to "$prefix/bin", with "$prefix" got from
-dnl gobject-2.0.pc: all the DLLs *must* be under the same directory.
-AC_ARG_VAR([DLLDIR], Place where Windows DLLs must be picked from)
-AS_IF([test -z "$DLLDIR"],
-      [DLLDIR="$($PKG_CONFIG --variable=prefix gobject-2.0)/bin"])
-AM_SUBST_NOTMAKE([DLLDIR])
+dnl Get the USRDIR from gobject-2.0.pc: all the dependencies *must* be
+dnl installed under the same prefix.
+USRDIR="$($PKG_CONFIG --variable=prefix gobject-2.0)"
+AC_SUBST([USRDIR])
+AM_SUBST_NOTMAKE([USRDIR])
 
 dnl -win$ARCH will be appended to the installer file name
 AS_IF([test "x${host_cpu}" = "xx86_64"],[ARCH=64],[ARCH=32])
-- 
2.11.4.GIT