From 1f492422a840e942d76a4e24be18b2e5b33661a9 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Sun, 3 Feb 2019 14:08:07 +0100 Subject: [PATCH] Fixed setup.sh for mac --- mk/macos/build-deps.sh | 2 +- mk/macos/setup.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mk/macos/build-deps.sh b/mk/macos/build-deps.sh index 1b1df4a5a..9f5a29ecb 100644 --- a/mk/macos/build-deps.sh +++ b/mk/macos/build-deps.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh brew install sdl2 lua fontconfig freetype ftgl libogg glew libvorbis cppunit glib fribidi miniupnpc wxmac brew outdated cmake || brew upgrade cmake; brew outdated pkgconfig || brew upgrade pkgconfig brew install Caskroom/cask/xquartz \ No newline at end of file diff --git a/mk/macos/setup.sh b/mk/macos/setup.sh index 6b96671a3..318be1dd6 100644 --- a/mk/macos/setup.sh +++ b/mk/macos/setup.sh @@ -1,10 +1,10 @@ -#!/bin/bash +#!/bin/sh echo echo "Initializing Glest setup..." currentDir=$PWD DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" cd $DIR -./build-deps.sh +bash ./build-deps.sh echo -./build.sh +bash ./build.sh cd $currentDir \ No newline at end of file