[libgda] Updated Windows compilation methods for Mingw GCC 4.7

[Vivien Malerba <vivien src gnome org>]

commit 7b4fe801473a6638d952cf0e479ff171ed2d35e3
Author: Vivien Malerba <malerba gnome-db org>
Date:   Sun Jun 3 22:28:46 2012 +0200

    Updated Windows compilation methods for Mingw GCC 4.7
    
    as packaged by Fedora 17

 installers/Windows/make-clean.sh     |    2 +-
 installers/Windows/make-zip-setup.sh |   22 +++++++++++++++-------
 tools/Makefile.am                    |    2 +-
 3 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/installers/Windows/make-clean.sh b/installers/Windows/make-clean.sh
index 15c42a8..88536a9 100755
--- a/installers/Windows/make-clean.sh
+++ b/installers/Windows/make-clean.sh
@@ -1,4 +1,4 @@
 #!/bin/bash
 
 export CLEAN=yes
-exec `dirname $0`/make-zip-setup.sh
\ No newline at end of file
+exec `dirname $0`/make-zip-setup.sh $1
diff --git a/installers/Windows/make-zip-setup.sh b/installers/Windows/make-zip-setup.sh
index 002df00..8477dbc 100755
--- a/installers/Windows/make-zip-setup.sh
+++ b/installers/Windows/make-zip-setup.sh
@@ -16,8 +16,20 @@
 # $version is the current Libgda's version
 #
 
-depend_path="/usr/i686-pc-mingw32/sys-root/mingw /local/Win32Compiled /local/Win32/bdb /local/Win32/mysql /local/Win32/pgsql /local/Win32/ldap /local/Win32/mdb /local/Win32/oracle"
-prefix=/local/Win32/Libgda
+if [ "$1" = "32" ]
+then
+  depend_path="/usr/i686-w64-mingw32/sys-root/mingw /usr/i686-pc-mingw32/sys-root/mingw /local/Win32Compiled /local/Win32/bdb /local/Win32/mysql /local/Win32/pgsql /local/Win32/ldap /local/Win32/mdb /local/Win32/oracle"
+  prefix=/local/Win32/Libgda
+else
+  if [ "$1" = "64" ]
+  then
+      depend_path="/usr/x86_64-w64-mingw32/sys-root/mingw /local/Win64Compiled /local/Win64/bdb /local/Win64/mysql /local/Win64/pgsql /local/Win64/ldap /local/Win64/mdb /local/Win64/oracle"
+      prefix=/local/Win32/Libgda
+  else
+      echo "You must specify the 32 or 64 bits."
+      exit 1
+  fi
+fi
 debug=no
 
 #
@@ -308,7 +320,7 @@ EOF
 #
 # dependencies DLLs
 #
-files=(libexpat.dll libgio-2.*.dll libglib-2.*.dll libgmodule-2.*.dll libgobject-2.*.dll libgthread-2.*.dll libxml2*.dll libsoup-2.*.dll libgdk_pixbuf-2.*.dll libgdk-3-0.dll libgtk-3-0.dll libatk-1.*.dll libpng*.dll libpango-1.*.dll libpangocairo-1.*.dll libpangoft2-1.*.dll libpangowin32-1.*.dll libcairo-2.dll libcairo-gobject-2.dll libfontconfig-1.dll libgoocanvas-*.dll libcdt*.dll libcgraph*.dll libgvc*.dll libpathplan*.dll libxdot*.dll libfreetype-6.dll libintl-8.dll libpixman-1-0.dll libjasper-1.dll libjpeg*.dll libtiff*.dll libffi*.dll readline.dll iconv.dll libgraph*.dll libgtksourceview*.dll libtermcap*.dll)
+files=(libexpat-1.dll libgio-2.*.dll libglib-2.*.dll libgmodule-2.*.dll libgobject-2.*.dll libgthread-2.*.dll libxml2*.dll libsoup-2.*.dll libgdk_pixbuf-2.*.dll libgdk-3-0.dll libgtk-3-0.dll libatk-1.*.dll libpng*.dll libpango-1.*.dll libpangocairo-1.*.dll libpangoft2-1.*.dll libpangowin32-1.*.dll libcairo-2.dll libcairo-gobject-2.dll libfontconfig-1.dll libgoocanvas-*.dll libcdt*.dll libcgraph*.dll libgvc*.dll libpathplan*.dll libxdot*.dll libfreetype-6.dll libintl-8.dll libpixman-1-0.dll libjasper-1.dll libjpeg*.dll libtiff*.dll libffi*.dll readline.dll iconv.dll libgraph*.dll libgtksourceview*.dll libtermcap*.dll)
 add_files_to_zip $archive_ext "${depend_path}" bin $files
 add_found_files_to_nsh core bin
 
@@ -520,10 +532,6 @@ files=(gdaui-entry-filesel-spec.xml gdaui-entry-password.xml gdaui-entry-pict-sp
 add_files_to_zip $archive $prefix lib/libgda-5.0/plugins $files
 add_found_files_to_nsh core lib/libgda-5.0/plugins
 
-files=(libwimp.dll)
-add_files_to_zip $archive_ext "${depend_path}" lib/gtk-3.0/3.0.0/engines $files
-add_found_files_to_nsh core lib/gtk-3.0/3.0.0/engines
-
 #
 # includes
 #
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 02a07ad..6745e25 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -68,7 +68,7 @@ endif
 
 # setenv() is in libiberty in mingw
 if PLATFORM_WIN32
-gda_sql_5_0_LDADD += -liberty
+
 gda_sql_5_0_SOURCES += gda-sql-res.rc
 endif