From 8ad98398ad9a2220407a40f417904df817d48e60 Mon Sep 17 00:00:00 2001 From: mathusummut Date: Sun, 3 Feb 2019 14:04:11 +0100 Subject: [PATCH] Fixed setup.sh for mac --- mk/macos/build-deps.sh | 1 + mk/macos/setup.sh | 10 +++++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mk/macos/build-deps.sh b/mk/macos/build-deps.sh index 0161f74a5..1b1df4a5a 100644 --- a/mk/macos/build-deps.sh +++ b/mk/macos/build-deps.sh @@ -1,3 +1,4 @@ +#!/bin/bash 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 8d033f602..6b96671a3 100644 --- a/mk/macos/setup.sh +++ b/mk/macos/setup.sh @@ -1,2 +1,10 @@ +#!/bin/bash +echo +echo "Initializing Glest setup..." +currentDir=$PWD +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )" +cd $DIR ./build-deps.sh -./build.sh \ No newline at end of file +echo +./build.sh +cd $currentDir \ No newline at end of file