use curl which is always available on osx rather than wget

diff --git a/.gitignore b/.gitignore
index a46e65d172e2298b860baafb38af1a0bf6a4c9be..5c64716a3e10b63ec085b2347036534fe12afe4a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -71,7 +71,7 @@ dat/NHTILES.BMP
 dat/msdoshlp.txt
 src/host_o/
 util/djgpp-linux64-gcc550.tar.bz2
-util/djgpp-linux64-gcc550.tar.bz2
+util/djgpp-osx-gcc550.tar.bz2
 util/djgpp-mingw-gcc550-standalone.zip
 util/dlb_main
 util/thintile

diff --git a/sys/msdos/msdos-cross-compile.sh b/sys/msdos/msdos-cross-compile.sh
index ec4bcae01a145217a2d3fe73a039d3e5a9eaa83c..a58cc9f174551f24f394f8966d7007d22cb02d7d 100644 (file)
--- a/sys/msdos/msdos-cross-compile.sh
+++ b/sys/msdos/msdos-cross-compile.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-
+set -x
 if [ -z "$TRAVIS_BUILD_DIR" ]; then
        export DJGPP_TOP=$(pwd)/djgpp
 else
@@ -27,7 +27,12 @@ DJGPP_URL="$DJGPP_URL$DJGPP_FILE"
 
 cd util
 if [ ! -f "$DJGPP_FILE" ]; then
-    wget --no-hsts "$DJGPP_URL"
+   if [ "$(uname)" = "Darwin" ]; then
+        #Mac
+       curl -L $DJGPP_URL -o $DJGPP_FILE
+   else
+        wget --no-hsts "$DJGPP_URL"
+   fi
 fi
 cd ../
 
@@ -50,12 +55,17 @@ fi
 # DOS-extender for use with djgpp
 cd djgpp
 if [ ! -d cwsdpmi ]; then
+    if [ "$(uname)" = "Darwin" ]; then
+       #Mac
+       curl http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip -o csdpmi7b.zip
+    else
        wget --no-hsts http://sandmann.dotster.com/cwsdpmi/csdpmi7b.zip
-       mkdir -p cwsdpmi
-       cd cwsdpmi
-       unzip ../csdpmi7b.zip
-       cd ../
-       rm csdpmi7b.zip
+    fi
+    mkdir -p cwsdpmi
+    cd cwsdpmi
+    unzip ../csdpmi7b.zip
+    cd ../
+    rm csdpmi7b.zip
 fi
 cd ../