Merge remote-tracking branch 'origin/terencehill/sdl_compilation'

* origin/terencehill/sdl_compilation:
  Add missing dependency for sdl compilation under mingw32

diff --git a/misc/tools/cached-converter.sh b/misc/tools/cached-converter.sh
index 09c042454d7350972298b19a12b4c39c384b27cd..b4fafee88ca1d7dc23e6f1ea26ec649ddeb86e7e 100755 (executable)
--- a/misc/tools/cached-converter.sh
+++ b/misc/tools/cached-converter.sh
@@ -384,6 +384,7 @@ for F in "$@"; do
                *_bump) will_dds=false ;;
                ./models/player/*) will_dds=false ;;
                ./models/sprites/*) will_dds=false ;;
+               ./models/*) ;;
                ./textures/*) ;;
                ./models/*) ;;
                ./particles/*) ;;

diff --git a/misc/tools/xonotic-map-compiler-autobuild b/misc/tools/xonotic-map-compiler-autobuild
index 0499f837792e070705dca5323a9219463b56f855..08c902ca90f65f8044dfe74e1cbf3cd79fbabb81 100755 (executable)
--- a/misc/tools/xonotic-map-compiler-autobuild
+++ b/misc/tools/xonotic-map-compiler-autobuild
@@ -292,6 +292,9 @@ screenshotthemap()
        rsync -vaSHP "$M-$blobhash" "$url_ssh"
        rsync -vaSHP "$M" "$url_ssh""latest/"
        if [ -n "$IRCSPAM" ]; then
+               # It takes about 5 minutes for the server to update.
+               sleep 360  # Cut it one more minute of slack.
+
                $IRCSPAM < "$M-$blobhash/$M.ircss" || true
        fi
        if [ -n "$BUILD_ONE" ]; then