Enable understanding pasted text strings with tabs.

[andy/viking.git] / win32 / installer-mingw.sh

diff --git a/win32/installer-mingw.sh b/win32/installer-mingw.sh
index 996d79f2a08533f9e0bf81daf3409a01628df057..5931af4540a74ecdfd546b6398c457d2752885e1 100755 (executable)
--- a/win32/installer-mingw.sh
+++ b/win32/installer-mingw.sh
@@ -15,10 +15,18 @@
 if [ -z "$DESTINATION" ]; then
        DESTINATION=installer/bin
 fi
+# General clean out tmp copy location so 32v64 versions can't conflict
+if [ -z "$NOCLEAN" ]; then
+       rm -rf installer/bin
+fi
 mkdir -p $DESTINATION
 
 if [ -z "$MINGW" ]; then
-  MINGW=/usr/i686-w64-mingw32/sys-root/mingw
+       if [ "$HOSTTYPE" == "x86_64" ]; then
+               MINGW=/usr/x86_64-w64-mingw32/sys-root/mingw
+       else
+               MINGW=/usr/i686-w64-mingw32/sys-root/mingw
+       fi
 fi
 MINGW_BIN=$MINGW/bin
 echo MINGW=$MINGW
@@ -56,7 +64,11 @@ cp ../data/latlontz.txt $DESTINATION/data
 
 echo Copying Helper Apps
 # Needed when spawning other programs (e.g. when invoking GPSBabel)
-cp $MINGW_BIN/gspawn-win32-helper.exe $DESTINATION
+if [ "$HOSTTYPE" == "x86_64" ]; then
+       cp $MINGW_BIN/gspawn-win64-helper.exe $DESTINATION
+else
+       cp $MINGW_BIN/gspawn-win32-helper.exe $DESTINATION
+fi
 
 echo Copying Libraries
 # Core libs
@@ -100,13 +112,26 @@ cp $MINGW_BIN/libplc*.dll $DESTINATION
 cp $MINGW_BIN/libplds*.dll $DESTINATION
 cp $MINGW_BIN/nss*.dll $DESTINATION
 cp $MINGW_BIN/ssl*.dll $DESTINATION
-cp /usr/share/doc/packages/mingw32-libcurl-devel/COPYING $DESTINATION/COPYING_curl.txt
+if [ "$HOSTTYPE" == "x86_64" ]; then
+       cp /usr/share/doc/packages/mingw64-libcurl-devel/COPYING $DESTINATION/COPYING_curl.txt
+else
+       cp /usr/share/doc/packages/mingw32-libcurl-devel/COPYING $DESTINATION/COPYING_curl.txt
+fi
 
-cp $MINGW_BIN/libexif*.dll $DESTINATION
+cp $MINGW_BIN/libexiv2.dll $DESTINATION
+cp $MINGW_BIN/libgexiv2*.dll $DESTINATION
+cp $MINGW_BIN/libstdc++*.dll $DESTINATION
 cp $MINGW_BIN/libbz*.dll $DESTINATION
 cp $MINGW_BIN/libmagic*.dll $DESTINATION
 cp $MINGW/share/misc/magic* $DESTINATION
 cp $MINGW_BIN/libsqlite3*.dll $DESTINATION
+cp $MINGW_BIN/libnettle*.dll $DESTINATION
+
+# Extra GTK stuff required for (default) theme to work in Windows
+mkdir -p $DESTINATION/lib
+cp -a $MINGW/lib/gtk-2.0 $DESTINATION/lib
+mkdir -p $DESTINATION/share/themes
+cp -a $MINGW/share/themes/MS-Windows $DESTINATION/share/themes
 
 echo Copying GPSBabel Installer
 mkdir $DESTINATION/Optional
@@ -120,4 +145,10 @@ else
        # Speedier install generation when testing
        makensis -X"SetCompress off" viking-installer.nsi
 fi
+
+if [ "$HOSTTYPE" == "x86_64" ]; then
+       rename viking viking-win64 viking-[0-9].[0-9].[0-9].[0-9].exe
+else
+       rename viking viking-win32 viking-[0-9].[0-9].[0-9].[0-9].exe
+fi
 popd