[giv] Fixed compilation on Windows with new Fedora cross compiler.

[Dov Grobgeld <dov src gnome org>]

commit 801dc5917cb3f4c9f490d7e1f04d7a5d67ce4f33
Author: Dov Grobgeld <dov grobgeld gmail com>
Date:   Wed Nov 9 23:23:36 2011 +0200

    Fixed compilation on Windows with new Fedora cross compiler.

 SConstruct                                         |   33 ++++------
 configure.in                                       |    2 +-
 giv.wine.nsi.in                                    |   67 ++++++++++----------
 src/SConscript                                     |    2 +-
 src/plugins/SConscript                             |    2 +-
 .../dcmtk/config/include/dcmtk/config/cfwin32.h    |    2 +-
 src/plugins/dicom.cc                               |    1 +
 7 files changed, 53 insertions(+), 56 deletions(-)
---
diff --git a/SConstruct b/SConstruct
index 7fdf011..56cd237 100644
--- a/SConstruct
+++ b/SConstruct
@@ -50,23 +50,20 @@ def template_fill(env, target, source):
     inp.close()
 
 if ARGUMENTS.get('mingw', 0):
-    env['CC']='i686-pc-mingw32-gcc'
-    env['SHCC']='i686-pc-mingw32-gcc'
-    env['CXX']='i686-pc-mingw32-g++'
-    env['SHCXX']='i686-pc-mingw32-g++'
-    env['AR']='i686-pc-mingw32-ar'
-    env['RANLIB']='i686-pc-mingw32-ranlib'
-    env['ENV']['PKG_CONFIG_PATH'] = "/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig"
-    env['PKGCONFIG'] = "env PKG_CONFIG_PATH=/usr/i686-pc-mingw32/sys-root/mingw/lib/pkgconfig:/usr/local/mingw32/lib/pkgconfig pkg-config"
+    env['CC']='i686-w64-mingw32-gcc'
+    env['CXX']='i686-w64-mingw32-g++'
+    env['AR']='i686-w64-mingw32-ar'
+    env['RANLIB']='i686-w64-mingw32-ranlib'
+    env['PKGCONFIG'] = "env PKG_CONFIG_PATH=/usr/i686-w64-mingw32/sys-root/mingw/lib/pkgconfig:/usr/local/mingw32/lib/pkgconfig pkg-config"
     env['OBJSUFFIX']=".obj"
-    env['SHLIBSUFFIX']=".dll"
-    env['SHLIBPREFIX']=""
-#    env['LIBSUFFIX']=".lib"
     env['PROGSUFFIX'] = ".exe"
-    env['CROOT'] = "/home/dov/.wine/drive_c/"
-    env['PREFIX'] = "/usr/i686-pc-minw32/sys-root"
-    env['DLLWRAP'] = "i686-pc-mingw32-dllwrap"
-    env['DLLTOOL'] = "i686-pc-mingw32-dlltool"
+    env['SHOBJSUFFIX']=".obj"
+    env['SHLIBSUFFIX'] = ".dll"
+    env['SHLIBPREFIX'] = ""
+    env['PREFIX'] = "/usr/i686-w64-mingw32/sys-root"
+    env['ROOT'] = ""
+    env['DLLWRAP'] = "i686-w64-mingw32-dllwrap"
+    env['DLLTOOL'] = "i686-w64-mingw32-dlltool"
     env['DLLWRAP_FLAGS'] = "--mno-cygwin --as=${AS} --export-all --driver-name ${CXX} --dll-tool-name ${DLLTOOL} -s"
     env.Append(CPPFLAGS= ['-mms-bitfields'])
 
@@ -90,10 +87,8 @@ if ARGUMENTS.get('mingw', 0):
                  "src/plugins/npy.dll",
                  ],
                 ["makensis giv.wine.nsi"])
-    env.Append(#LINKFLAGS=['-mwindows'],
-#               CPPPATH=["/usr/local/mingw32/include"],
-#               LIBPATH=["/usr/local/mingw32/lib"],
-               )
+    env.Append(LINKFLAGS=['-mwindows'])
+
     # TBD - make this installation dependent
     env['PACKAGE_DOC_DIR'] = '../doc'
     env['PACKAGE_PLUGIN_DIR'] = '../plugins'
diff --git a/configure.in b/configure.in
index 4e8db08..e384961 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
 PACKAGE=givwidget
 GIVWIDGET_API_VERSION=2.0
 
-AM_INIT_AUTOMAKE(giv, 0.9.19)
+AM_INIT_AUTOMAKE(giv, 0.9.20)
 
 dnl Use libtool to get shared libraries
 LT_PREREQ
diff --git a/giv.wine.nsi.in b/giv.wine.nsi.in
index 35058f2..48fe6f2 100644
--- a/giv.wine.nsi.in
+++ b/giv.wine.nsi.in
@@ -35,38 +35,39 @@ File /r examples
 SetOutPath $INSTDIR\bin
 File src\Giv.exe
 File src\giv-image.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libgcc_s_sjlj-1.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libstdc++-6.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libiconv-2.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libpcre-0.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libintl-8.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libgdk-win32*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libgdk_pixbuf*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libgtk-win32*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libgio*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libcairo*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libjasper-1.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\zlib*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libglib*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libatk*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libgobject*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libgmodule*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libgthread*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libpango*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libpng*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libtiff*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libjpeg*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libpixman-1-0.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libfontconfig*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\libfreetype*.dll
-File \usr\i686-pc-mingw32\sys-root\mingw\bin\gdk-pixbuf-query-loaders.exe
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libgcc_s_sjlj-1.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libstdc++-6.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\iconv.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libpcre-0.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libintl-8.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libffi-6.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libgdk-win32*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libgdk_pixbuf*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libgtk-win32*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libgio*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libcairo*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libjasper-1.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\zlib*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libglib*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libatk*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libgobject*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libgmodule*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libgthread*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libpango*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libpng*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libtiff*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libjpeg*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libpixman-1-0.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libfontconfig*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\libfreetype*.dll
+File \usr\i686-w64-mingw32\sys-root\mingw\bin\gdk-pixbuf-query-loaders.exe
 
 SetOutPath $INSTDIR\etc
-File /r \usr\i686-pc-mingw32\sys-root\mingw\etc\gtk-2.0
-File /r \usr\i686-pc-mingw32\sys-root\mingw\etc\fonts
-File /r \usr\i686-pc-mingw32\sys-root\mingw\etc\pango
+File /r \usr\i686-w64-mingw32\sys-root\mingw\etc\gtk-2.0
+File /r \usr\i686-w64-mingw32\sys-root\mingw\etc\fonts
+File /r \usr\i686-w64-mingw32\sys-root\mingw\etc\pango
 SetOutPath $INSTDIR\etc\gtk-2.0
-File \usr\i686-pc-mingw32\sys-root\mingw\share\themes\MS-Windows\gtk-2.0\gtkrc
+File \usr\i686-w64-mingw32\sys-root\mingw\share\themes\MS-Windows\gtk-2.0\gtkrc
 
 # Plugins
 SetOutPath $INSTDIR\plugins
@@ -74,15 +75,15 @@ File src\plugins\*.dll
 
 # pango
 SetOutPath $INSTDIR\lib
-File /r \usr\i686-pc-mingw32\sys-root\mingw\lib\pango
+File /r \usr\i686-w64-mingw32\sys-root\mingw\lib\pango
 
 # pixbuf etc
 SetOutPath $INSTDIR\lib\gdk-pixbuf-2.0\2.10.0
-File /r \usr\i686-pc-mingw32\sys-root\mingw\lib\gdk-pixbuf-2.0\2.10.0\loaders*
+File /r \usr\i686-w64-mingw32\sys-root\mingw\lib\gdk-pixbuf-2.0\2.10.0\loaders*
 SetOutPath $INSTDIR\lib\gtk-2.0\2.10.0\engines
-File \usr\i686-pc-mingw32\sys-root\mingw\lib\gtk-2.0\2.10.0\engines\*
+File \usr\i686-w64-mingw32\sys-root\mingw\lib\gtk-2.0\2.10.0\engines\*
 SetOutPath $INSTDIR\share\themes 
-File /r \usr\i686-pc-mingw32\sys-root\mingw\share\themes\*
+File /r \usr\i686-w64-mingw32\sys-root\mingw\share\themes\*
 
 # Build the gdk-pixbuf.loaders file automatically
 #ExpandEnvStrings $0 %COMSPEC%
diff --git a/src/SConscript b/src/SConscript
index 22496cb..ae862c0 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -43,7 +43,7 @@ if ARGUMENTS.get('mingw', 0):
                       ["giv.rc",
                        "giv-logo.ico"
                       ],
-                      ["i686-pc-mingw32-windres giv.rc giv.res.obj"],
+                      ["i686-w64-mingw32-windres giv.rc giv.res.obj"],
                       chdir=1)
     print "res = ", res
     src_giv_exe = src_giv_exe + res
diff --git a/src/plugins/SConscript b/src/plugins/SConscript
index 9b0410c..52a2982 100644
--- a/src/plugins/SConscript
+++ b/src/plugins/SConscript
@@ -34,7 +34,7 @@ if not env['SBOX']:
                       )
 
     if ARGUMENTS.get('mingw', 0):
-        png_lib = ['png14']
+        png_lib = ['png15']
     else:
         png_lib = []
     env.SharedLibrary('png',
diff --git a/src/plugins/dcmtk/config/include/dcmtk/config/cfwin32.h b/src/plugins/dcmtk/config/include/dcmtk/config/cfwin32.h
index 2ae9e8f..2c00290 100644
--- a/src/plugins/dcmtk/config/include/dcmtk/config/cfwin32.h
+++ b/src/plugins/dcmtk/config/include/dcmtk/config/cfwin32.h
@@ -888,6 +888,6 @@ typedef unsigned short ushort;
 #endif /* _WIN32 */
 
 #include <windows.h>
-#define unlink(s) DeleteFile(s)
+#define dcmtk_unlink(s) DeleteFile(s)
 
 #endif /* CFWIN32_H */
diff --git a/src/plugins/dicom.cc b/src/plugins/dicom.cc
index 333fa2e..154217f 100644
--- a/src/plugins/dicom.cc
+++ b/src/plugins/dicom.cc
@@ -6,6 +6,7 @@
 //  Mon Nov  9 06:28:09 2009
 //----------------------------------------------------------------------
 
+#include <stdio.h>
 #include "dcmtk/dcmdata/dcfilefo.h"
 #include "dcmtk/dcmdata/dcdeftag.h"
 #include "../givimage.h"