X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=build-projects%2Fandroid%2Fbuild-scripts%2Fcreate_sdl.sh;h=5ec679e1eba56ddbc2385eb2d75d7361e7581826;hb=86d87df2e5d8cd31e53fe0427f0e7e16146b5594;hp=7198dfb3636e1438557b6c55a6043dd3795e74a5;hpb=51d5e483a5d8b50e0c0956053e0e264c20382928;p=rocksndiamonds.git

diff --git a/build-projects/android/build-scripts/create_sdl.sh b/build-projects/android/build-scripts/create_sdl.sh
index 7198dfb3..5ec679e1 100755
--- a/build-projects/android/build-scripts/create_sdl.sh
+++ b/build-projects/android/build-scripts/create_sdl.sh
@@ -5,26 +5,39 @@ JNI_DIR="app/jni"
 ANDROID_MK_SDL_IMAGE="$JNI_DIR/SDL2_image/Android.mk"
 ANDROID_MK_SDL_MIXER="$JNI_DIR/SDL2_mixer/Android.mk"
 
-SDL_BASE_URL="https://www.libsdl.org"
+SDL_BASE_URL_ORIGINAL="https://www.libsdl.org"
+SDL_BASE_URL_FALLBACK="https://www.artsoft.org"
 SDL_VERSIONS=`cat SDL_VERSIONS`
 
 for i in $SDL_VERSIONS; do
     SDL_SUBDIR=`echo $i | sed -e "s/-.*//"`
     SDL_SUBURL=`echo $SDL_SUBDIR | tr -d '2'`
 
+    if [ -d "$JNI_DIR/$SDL_SUBDIR" ]; then
+	continue;
+    fi
+
     if [ "$SDL_SUBURL" = "SDL" ]; then
 	SDL_RELEASE_DIR="release"
     else
 	SDL_RELEASE_DIR="projects/$SDL_SUBURL/release"
     fi
 
-    SDL_URL="$SDL_BASE_URL/$SDL_RELEASE_DIR/$i.tar.gz"
+    SDL_URL="$SDL_BASE_URL_ORIGINAL/$SDL_RELEASE_DIR/$i.tar.gz"
 
-    wget -O - "$SDL_URL" | (cd "$JNI_DIR" && tar xzf -)
+    wget --timeout=10 -O - "$SDL_URL" | (cd "$JNI_DIR" && tar xzf -)
 
     if [ "$?" != "0" ]; then
-	echo "ERROR: Installing '$i' failed!"
-	exit 10
+	echo "ERROR: Installing '$i' from main site failed -- trying fallback!"
+
+	SDL_URL="$SDL_BASE_URL_FALLBACK/RELEASES/sdl/$i.tar.gz"
+
+	wget --timeout=10 -O - "$SDL_URL" | (cd "$JNI_DIR" && tar xzf -)
+
+	if [ "$?" != "0" ]; then
+	    echo "ERROR: Installing '$i' from fallback site failed!"
+	    exit 10
+	fi
     fi
 
     mv "$JNI_DIR/$i" "$JNI_DIR/$SDL_SUBDIR"