From 2dda7e9f94a12828af7f71a65fd05b2a6f7d68a5 Mon Sep 17 00:00:00 2001 From: "Miso Zmiric (Mike Squinter)" Date: Fri, 3 Jul 2015 08:54:35 +0100 Subject: [PATCH] fix old bug in unix build where we built g2 before symlinking --- build.sh | 8 ++++---- install.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build.sh b/build.sh index 49df49f378..9a96a9851d 100755 --- a/build.sh +++ b/build.sh @@ -11,15 +11,15 @@ pushd build make popd +if [[ ! -h openrct2.dll ]]; then + ln -s build/openrct2.dll openrct2.dll +fi + if [[ -z "$DISABLE_G2_BUILD" ]]; then echo Building: data/g2.dat ./build_g2.sh > /dev/null 2>&1 fi -if [[ ! -h openrct2.dll ]]; then - ln -s build/openrct2.dll openrct2.dll -fi - if [[ -t 1 ]]; then echo -e "\nDone! Run OpenRCT2 by typing:\n\n\033[95mwine openrct2.exe\n\033[0m" else diff --git a/install.sh b/install.sh index fdc3a6778a..a3287d6413 100755 --- a/install.sh +++ b/install.sh @@ -85,7 +85,7 @@ if [[ ! -d $cachedir/SDL2-${SDL2_PV} ]]; then popd fi if [[ ! -f $cachedir/orctlibs.zip ]]; then - wget https://download.openrct2.website/dev/lib/mingw --secure-protocol=tlsv1_2 --output-document $cachedir/orctlibs.zip; + wget https://download.openrct2.website/dev/lib/mingw --secure-protocol=TLSv1 --output-document $cachedir/orctlibs.zip; fi if [[ ! -d $cachedir/orctlibs ]]; then mkdir -p $cachedir/orctlibs