This commit is contained in:
Kevin Burke 2014-05-27 20:24:25 +09:00
parent 835835bbec
commit b40d92f359
2 changed files with 6 additions and 8 deletions

View File

@ -12,8 +12,8 @@ pushd build
popd
if [[ -t 1 ]]; then
echo "\033[95mDone! Run OpenRCT2 by typing:\n\nwine openrct2.exe\n\033[0m"
echo -e "\nDone! Run OpenRCT2 by typing:\n\n\033[95mwine openrct2.exe\n\033[0m"
else
echo "Done! Run OpenRCT2 by typing:\n\nwine openrct2.exe\n"
echo -e "\nDone! Run OpenRCT2 by typing:\n\nwine openrct2.exe\n"
fi

View File

@ -65,12 +65,10 @@ if [[ ! -d /usr/local/cross-tools/i686-w64-mingw32 ]]; then
fi
if [[ ! -f $cachedir/i686-w64-mingw32-pkg-config ]]; then
if [[ `uname` == "Darwin" ]]; then
# BSD echo doesn't recognize the -e flag.
echo "#! /bin/sh\nexport PKG_CONFIG_LIBDIR=/usr/local/cross-tools/i686-w64-mingw32/lib/pkgconfig\npkg-config \$@" > $cachedir/i686-w64-mingw32-pkg-config;
else
echo -e "#! /bin/sh\nexport PKG_CONFIG_LIBDIR=/usr/local/cross-tools/i686-w64-mingw32/lib/pkgconfig\npkg-config \$@" > $cachedir/i686-w64-mingw32-pkg-config;
fi
# If this fails to work because of newlines, be sure you are running this
# script with Bash, and not sh. We should really move this to a separate
# file.
echo -e "#! /bin/sh\nexport PKG_CONFIG_LIBDIR=/usr/local/cross-tools/i686-w64-mingw32/lib/pkgconfig\npkg-config \$@" > $cachedir/i686-w64-mingw32-pkg-config;
fi
chmod +x $cachedir/i686-w64-mingw32-pkg-config