]> git.lizzy.rs Git - dragonfireclient.git/commitdiff
Update some libraries for buildbot
authorsfan5 <sfan5@live.de>
Mon, 10 Feb 2020 23:20:40 +0000 (00:20 +0100)
committersfan5 <sfan5@live.de>
Wed, 12 Feb 2020 21:25:36 +0000 (22:25 +0100)
util/buildbot/buildwin32.sh
util/buildbot/buildwin64.sh

index a57aa7f3c1bb394fb6f04dad061d0ac1ad94c6b1..090ac7b0d9f08fbd84428aa475707ceee38d58bc 100755 (executable)
@@ -20,26 +20,24 @@ packagedir=$builddir/packages
 libdir=$builddir/libs
 
 # Test which win32 compiler is present
-which i586-mingw32msvc-windres > /dev/null 2>&1 && toolchain_file=$dir/toolchain_i586-mingw32msvc.cmake
-which i686-w64-mingw32-windres > /dev/null 2>&1 && toolchain_file=$dir/toolchain_i646-w64-mingw32.cmake
+which i586-mingw32msvc-windres &>/dev/null && toolchain_file=$dir/toolchain_i586-mingw32msvc.cmake
+which i686-w64-mingw32-windres &>/dev/null && toolchain_file=$dir/toolchain_i646-w64-mingw32.cmake
 
-if [ -z "$toolchain_file" ]
-then
+if [ -z "$toolchain_file" ]; then
        echo "Unable to determine which mingw32 compiler to use"
        exit 1
-else
-       echo "Using $toolchain_file"
 fi
+echo "Using $toolchain_file"
 
 irrlicht_version=1.8.4
 ogg_version=1.3.2
 vorbis_version=1.3.5
 curl_version=7.65.3
-gettext_version=0.19.8.1
-freetype_version=2.9.1
+gettext_version=0.20.1
+freetype_version=2.10.1
 sqlite3_version=3.27.2
 luajit_version=2.1.0-beta3
-leveldb_version=1.20
+leveldb_version=1.22
 zlib_version=1.2.11
 
 mkdir -p $packagedir
index 92715fa64a0450c723bf9d8d35cdf77e6a4c6c5a..b24a478d8a3da021ee8d56b7ceab99d3c40b4136 100755 (executable)
@@ -24,11 +24,11 @@ irrlicht_version=1.8.4
 ogg_version=1.3.2
 vorbis_version=1.3.5
 curl_version=7.65.3
-gettext_version=0.19.8.1
-freetype_version=2.9.1
+gettext_version=0.20.1
+freetype_version=2.10.1
 sqlite3_version=3.27.2
 luajit_version=2.1.0-beta3
-leveldb_version=1.20
+leveldb_version=1.22
 zlib_version=1.2.11
 
 mkdir -p $packagedir