From c1dd898df6986ff37a786d018bf5898ab3743a32 Mon Sep 17 00:00:00 2001 From: nhmall Date: Sun, 24 Nov 2019 13:37:22 -0500 Subject: [PATCH] use curl which is always available on osx rather than wget --- .gitignore | 2 +- sys/msdos/msdos-cross-compile.sh | 24 +++++++++++++++++------- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index a46e65d17..5c64716a3 100644 --- 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 ec4bcae01..a58cc9f17 100644 --- 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 ../ -- 2.50.1