From 89849fde488abe20a1adce96020212f19ded505a Mon Sep 17 00:00:00 2001
From: ice0 <konoplin@gmail.com>
Date: Aug 24 2018 04:43:19 +0000
Subject: Added thumbnails to .gitignore, fixed OSX build


---

diff --git a/.gitignore b/.gitignore
index be05941..0879af7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,6 +19,9 @@ build/
 
 .kdev4/
 
+# ---- MacOS thumbnails ------------
+.DS_Store
+
 # ------------------------------------------------------------------------
 
 # generated in ETL, core and studio
diff --git a/autobuild/osx/brew/synfigstudio-osx-build.sh b/autobuild/osx/brew/synfigstudio-osx-build.sh
index 34f1ac8..1f4b86d 100755
--- a/autobuild/osx/brew/synfigstudio-osx-build.sh
+++ b/autobuild/osx/brew/synfigstudio-osx-build.sh
@@ -3,8 +3,8 @@
 # libtool for synfig-core glibtoolize
 # gettext for autopoint
 
-# autopoint is not in PATH after install (conflicting with system gettext https://github.com/Homebrew/legacy-homebrew/issues/24070)
-# so we can do `brew link --force gettext` or just add it to PATH before configuring
+# autopoint is not in PATH after install via brew (conflicting with system gettext https://github.com/Homebrew/legacy-homebrew/issues/24070)
+# so we can do `brew link --force gettext` or just add it to PATH before configuring which is preferable because we need it only for compiling
 
 #export PATH=/usr/local/opt/gettext/bin:$PATH
 # assume we have ccache and gettext already installed
@@ -17,29 +17,6 @@ MAKE_OPTIONS="-j$MAKE_THREADS --silent LIBTOOLFLAGS=--silent"
 
 set -e
 
-# enable ccache for speedup
-enable_ccache()
-{
-    if which ccache > /dev/null; then
-        echo "ccache found! Enabling ccache..."
-        
-        # set CC/CXX variables if it is not already
-        if [ -z $CC ]; then
-            export CC=gcc
-        fi
-        if [ -z $CXX ]; then
-            export CXX=g++
-        fi
-
-        export CC="ccache $CC"
-        export CXX="ccache $CXX"
-        echo "CC=$CC"
-        echo "CXX=$CXX"
-    else
-        echo "ccache not found..."
-    fi
-}
-
 travis_fold_start()
 {
 	if [ -n "$TRAVIS" ]; then
@@ -55,9 +32,6 @@ travis_fold_end()
 }
 
 
-
-# enable_ccache
-
 # move to synfig root dir
 pushd "$SCRIPT_PATH/../../../"
 
@@ -69,7 +43,7 @@ pushd ETL
 popd # ETL
 travis_fold_end ETL
 
-travis_fold_start synfig-core "Building synfig-core"
+travis_fold_start synfig-core "Building Synfig Core"
 pushd synfig-core
   ./bootstrap.sh
   ./configure
@@ -81,9 +55,13 @@ travis_fold_start synfig-studio "Building Synfig Studio"
 pushd synfig-studio
   ./bootstrap.sh
   ./configure
+  pushd build_tools # enter src directory to skip image building
+    make install $MAKE_OPTIONS
+  popd # build_tools
+
   pushd src # enter src directory to skip image building
     make install $MAKE_OPTIONS
-  popd #src
+  popd # src
 popd # synfig-studio
 travis_fold_end synfig-studio