[gnumeric] [win32] try to support building on 64bit hosts

[Jody Goldberg <jody src gnome org>]

commit 0adadc9aba5e07159f81f5bd77f8200f810c8557
Author: Jody Goldberg <jody gnome org>
Date:   Thu Nov 5 06:00:03 2009 -0500

    [win32] try to support building on 64bit hosts
    
        * bump to newer cairo too
        * dist fixes
        * update build TODOs

 tools/win32/Makefile.am  |   10 +++++-----
 tools/win32/build        |    2 +-
 tools/win32/jhbuildrc.py |   13 ++++++++-----
 tools/win32/moduleset.in |    8 ++++----
 4 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/tools/win32/Makefile.am b/tools/win32/Makefile.am
index df3f380..ab2d1ca 100755
--- a/tools/win32/Makefile.am
+++ b/tools/win32/Makefile.am
@@ -1,19 +1,19 @@
 all:
 
-debug::
+debug:: moduleset
 	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) debug
 
-release::
+release:: moduleset
 	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) release
 
-debug_shell::
+debug_shell:: moduleset
 	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) debug_shell
 
-release_shell::
+release_shell:: moduleset
 	$(abs_srcdir)/build $(abs_builddir) $(abs_srcdir) debug_shell
 
 clean:
 	rm -rf debug release
 
-EXTRA_DIST = gnumeric.nsi.in build gtkrc moduleset.in jhbuildrc-release
+EXTRA_DIST = gnumeric.nsi.in build gtkrc moduleset.in jhbuildrc.py
 .PHONY : debug release debug_shell release_shell
diff --git a/tools/win32/build b/tools/win32/build
index 86ce25e..2bfa5b2 100755
--- a/tools/win32/build
+++ b/tools/win32/build
@@ -63,6 +63,6 @@ build_ls_s() {
 ################################################################
 # TODO
 #    - pangorc
-#    - better sharing between -debug and -release
+#    - better auto location of jbuild (not always in HOME)
 #    - doc generation and deployment
 #    - packaging
diff --git a/tools/win32/jhbuildrc.py b/tools/win32/jhbuildrc.py
index 3197282..edf0a24 100644
--- a/tools/win32/jhbuildrc.py
+++ b/tools/win32/jhbuildrc.py
@@ -25,6 +25,7 @@ os.environ['TARGET']	= 'i586-pc-mingw32msvc'
 os.environ['PKG_CONFIG']= '/usr/bin/pkg-config'
 
 addpath('PKG_CONFIG_PATH', os.path.join(os.sep, prefix, 'lib', 'pkgconfig'))
+addpath('PKG_CONFIG_PATH', os.path.join(os.sep, prefix, 'lib64', 'pkgconfig'))
 addpath('PKG_CONFIG_PATH', os.path.join(os.sep, prefix, 'share', 'pkgconfig'))
 
 #Prefix for all the tools
@@ -51,14 +52,16 @@ if os.getenv('JH_TARGET') == "debug":
 elif os.getenv('JH_TARGET') == "release":
     optim = ' -O2'
 else:
-    print "Best to invoke this via make"
+    print "Best to invoke this via build script from make"
     sys.exit (0)
 
 #Exporting tool flags enviroment variables
-os.environ['LDFLAGS']	 = ' -mno-cygwin -L'+prefix+'/lib  -no-undefined'
-os.environ['CFLAGS']	 = ' -O0 -gstabs -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686 ' 
-os.environ['CPPFLAGS']	 = ' -O0 -gstabs -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686'
-os.environ['CXXFLAGS']	 = ' -O0 -gstabs -I'+prefix+'/include -mno-cygwin -mms-bitfields -march=i686 '
+os.environ['LDFLAGS']	 = ' -mno-cygwin -no-undefined' + \
+    ' -L' + os.path.join(os.sep, prefix, 'lib') + \
+    ' -L' + os.path.join(os.sep, prefix, 'lib64')
+os.environ['CFLAGS']	 = optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, prefix, 'include')
+os.environ['CPPLAGS']	 = optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, prefix, 'include')
+os.environ['CXXLAGS']	 = optim + ' -mno-cygwin -mms-bitfields -march=i686 ' + ' -I' + os.path.join(os.sep, prefix, 'include')
 os.environ['ARFLAGS']	 = 'rcs'
 os.environ['INSTALL']	 = os.path.expanduser('~/bin/install-check')
 os.environ['ACLOCAL_AMFLAGS'] = ' -I '+prefix+'/share/aclocal'	# for libgnomedb
diff --git a/tools/win32/moduleset.in b/tools/win32/moduleset.in
index 7f92336..f914b5f 100644
--- a/tools/win32/moduleset.in
+++ b/tools/win32/moduleset.in
@@ -97,13 +97,13 @@
 <!-- Gtk stack -->
     <autotools id="pixman">
 	<branch repo="cairographics"
-		module="pixman-0.14.0.tar.gz"
-		version="0.14.0"/>
+		module="pixman-0.16.2.tar.gz"
+		version="0.16.2"/>
     </autotools>
     <autotools id="cairo">
 	<branch repo="cairographics"
-		module="cairo-1.8.2.tar.gz"
-		version="1.8.2">
+		module="cairo-1.8.8.tar.gz"
+		version="1.8.8">
 	</branch>
 	<dependencies>
 	    <dep package="zlib"/>