From aac35a6e7c9c492ca1f8112a6ea55e06e36ef0e4 Mon Sep 17 00:00:00 2001
From: Loic Blot <loic.blot@unix-experience.fr>
Date: Mon, 21 May 2018 23:14:54 +0200
Subject: [PATCH] Backport buildbot win32 scripts too

---
 util/buildbot/buildwin32.sh | 17 ++++++++++-------
 util/buildbot/buildwin64.sh | 17 ++++++++++-------
 2 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh
index d807003d2..1478bc926 100755
--- a/util/buildbot/buildwin32.sh
+++ b/util/buildbot/buildwin32.sh
@@ -16,13 +16,13 @@ toolchain_file=$dir/toolchain_mingw.cmake
 irrlicht_version=1.8.4
 ogg_version=1.3.2
 vorbis_version=1.3.5
-curl_version=7.50.3
+curl_version=7.54.0
 gettext_version=0.19.8.1
-freetype_version=2.7
-sqlite3_version=3.14.2
-luajit_version=2.1.0-beta2
-leveldb_version=1.18
-zlib_version=1.2.8
+freetype_version=2.8
+sqlite3_version=3.19.2
+luajit_version=2.1.0-beta3
+leveldb_version=1.19
+zlib_version=1.2.11
 
 mkdir -p $packagedir
 mkdir -p $libdir
@@ -149,6 +149,9 @@ cmake .. \
 	-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
 	-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll
 
-make package -j2
+make -j2
 
+[ "x$NO_PACKAGE" = "x" ] && make package
+
+exit 0
 # EOF
diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh
index 3d6965f1e..81fbf43fa 100755
--- a/util/buildbot/buildwin64.sh
+++ b/util/buildbot/buildwin64.sh
@@ -16,13 +16,13 @@ toolchain_file=$dir/toolchain_mingw64.cmake
 irrlicht_version=1.8.4
 ogg_version=1.3.2
 vorbis_version=1.3.5
-curl_version=7.50.3
+curl_version=7.54.0
 gettext_version=0.19.8.1
-freetype_version=2.7
-sqlite3_version=3.14.2
-luajit_version=2.1.0-beta2
-leveldb_version=1.18
-zlib_version=1.2.8
+freetype_version=2.8
+sqlite3_version=3.19.2
+luajit_version=2.1.0-beta3
+leveldb_version=1.19
+zlib_version=1.2.11
 
 mkdir -p $packagedir
 mkdir -p $libdir
@@ -150,6 +150,9 @@ cmake .. \
 	-DLEVELDB_LIBRARY=$libdir/leveldb/lib/libleveldb.dll.a \
 	-DLEVELDB_DLL=$libdir/leveldb/bin/libleveldb.dll
 
-make package -j2
+make -j2
 
+[ "x$NO_PACKAGE" = "x" ] && make package
+
+exit 0
 # EOF