gnucash-on-windows master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash-on-windows/commit/e21e9e3e (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/6f221976 (commit)
	 via  https://github.com/Gnucash/gnucash-on-windows/commit/2200481c (commit)
	from  https://github.com/Gnucash/gnucash-on-windows/commit/15c983d7 (commit)



commit e21e9e3efd5bb0c46917c44a864c5a6bc60a2e1f
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Jul 3 18:48:25 2017 +0200

    Add icu dir to devrc as well

diff --git a/devrc.sh b/devrc.sh
index 70c20e6..d211368 100644
--- a/devrc.sh
+++ b/devrc.sh
@@ -48,6 +48,7 @@ GNUCASH_UDIR=$GLOBAL_UDIR/gnucash/inst
 GNUTLS_UDIR=$GLOBAL_UDIR/gnutls
 GOFFICE_UDIR=$GLOBAL_UDIR/goffice
 GUILE_UDIR=$GLOBAL_UDIR/guile
+ICU4C_DIR=$GLOBAL_UDIR/icu-mingw32
 LIBDBI_UDIR=$GLOBAL_UDIR/libdbi
 LIBGSF_UDIR=$GLOBAL_UDIR/libgsf
 LIBOFX_UDIR=$GLOBAL_UDIR/libofx
@@ -64,7 +65,7 @@ SWIG_UDIR=$GLOBAL_UDIR/swig
 WEBKIT_UDIR=$GLOBAL_UDIR/webkit
 BOOST_UDIR=$GLOBAL_UDIR/boost
 
-PATH=$AQBANKING_UDIR/bin:$CMAKE_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$NINJA_UDIR:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$SWIG_UDIR:$WEBKIT_UDIR/bin:$BOOST_UDIR/lib
+PATH=$AQBANKING_UDIR/bin:$CMAKE_UDIR/bin:$GWENHYWFAR_UDIR/bin:$ENCHANT_UDIR/bin:$GNOME_UDIR/bin:$GNUCASH_UDIR/bin:$GNUCASH_UDIR/lib:$GNUTLS_UDIR/bin:$GOFFICE_UDIR/bin:$GUILE_UDIR/bin:$ICU4C_DIR/lib:$LIBDBI_UDIR/bin:$LIBGSF_UDIR/bin:$LIBOFX_UDIR/bin:$LIBSOUP_UDIR/bin:$LIBXSLT_UDIR/bin:$MYSQL_UDIR/bin:$MYSQL_UDIR/lib:$NINJA_UDIR:$OPENSP_UDIR/bin:$PCRE_UDIR/bin:$PGSQL_UDIR/bin:$PGSQL_UDIR/lib:$REGEX_UDIR/bin:$SQLITE3_UDIR/bin:$SWIG_UDIR:$WEBKIT_UDIR/bin:$BOOST_UDIR/lib
 
 PATH=$PATH:$OLDPATH
 

commit 6f221976d4c3ebc6c6080a14edda328277c25e3a
Merge: 15c983d 2200481
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Mon Jul 3 18:21:36 2017 +0200

    Merge branch 'fix-icu-lib' of https://github.com/kcwu/gnucash-on-windows


commit 2200481c51ba475b7d55cec294765da740301276
Author: Kuang-che Wu <kcwu at csie.org>
Date:   Mon Jun 26 22:44:34 2017 +0800

    Add icu lib to path of launcher

diff --git a/install-impl.sh b/install-impl.sh
index acfac61..8d11d11 100644
--- a/install-impl.sh
+++ b/install-impl.sh
@@ -1572,6 +1572,7 @@ set PATH=$LIBSOUP_DIR\\bin;%PATH%
 set PATH=$LIBSOUP_DIR\\lib;%PATH%
 set PATH=$LIBXSLT_DIR\\bin;%PATH%
 set PATH=$LIBXSLT_DIR\\lib;%PATH%
+set PATH=$ICU4C_DIR\\lib;%PATH%
 
 set LTDL_LIBRARY_PATH=${INSTALL_DIR}\\lib
 



Summary of changes:
 devrc.sh        | 3 ++-
 install-impl.sh | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)