diff options
| -rwxr-xr-x | util/buildbot/buildwin32.sh | 16 | ||||
| -rwxr-xr-x | util/buildbot/buildwin64.sh | 6 |
2 files changed, 10 insertions, 12 deletions
diff --git a/util/buildbot/buildwin32.sh b/util/buildbot/buildwin32.sh index a57aa7f3c..090ac7b0d 100755 --- a/util/buildbot/buildwin32.sh +++ b/util/buildbot/buildwin32.sh @@ -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 diff --git a/util/buildbot/buildwin64.sh b/util/buildbot/buildwin64.sh index 92715fa64..b24a478d8 100755 --- a/util/buildbot/buildwin64.sh +++ b/util/buildbot/buildwin64.sh @@ -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 |