From f37c06323a1be83c907fe644fedd4a13cb9372a6 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Sun, 22 May 2016 18:43:06 +0200
Subject: [PATCH] Fix OSX build scripts, split for 10.6 and 10.10 host

---
 .gitignore                                    |  2 +
 dpf/distrho/DistrhoUtils.hpp                  |  2 +-
 dpf/distrho/src/DistrhoDefines.h              |  4 +-
 ...ack-macos-cross.sh => pack-macos-10.06.sh} |  4 +-
 utils/pack-macos-10.10.sh                     | 58 +++++++++++++++++++
 5 files changed, 66 insertions(+), 4 deletions(-)
 rename utils/{pack-macos-cross.sh => pack-macos-10.06.sh} (93%)
 create mode 100755 utils/pack-macos-10.10.sh

diff --git a/.gitignore b/.gitignore
index 9ed51fb..9b9e472 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,11 +2,13 @@
 *.d
 *.o
 
+*-e
 *.exe
 *.dll
 *.dylib
 *.so
 *.zip
 
+.DS_Store
 bin/*
 dpf/utils/lv2_ttl_generator
diff --git a/dpf/distrho/DistrhoUtils.hpp b/dpf/distrho/DistrhoUtils.hpp
index 9b768cb..bd2eeff 100644
--- a/dpf/distrho/DistrhoUtils.hpp
+++ b/dpf/distrho/DistrhoUtils.hpp
@@ -33,7 +33,7 @@
 # include <stdint.h>
 #endif
 
-#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC) && ! defined(__clang__)
+#if defined(DISTRHO_OS_MAC) && ! defined(CARLA_OS_MAC) && ! (defined(DISTRHO_PROPER_CPP11_SUPPORT) && defined(__clang__))
 namespace std {
 inline float fmin(float __x, float __y)
   { return __builtin_fminf(__x, __y); }
diff --git a/dpf/distrho/src/DistrhoDefines.h b/dpf/distrho/src/DistrhoDefines.h
index 3093bba..4449998 100644
--- a/dpf/distrho/src/DistrhoDefines.h
+++ b/dpf/distrho/src/DistrhoDefines.h
@@ -55,7 +55,9 @@
 
 /* Check for C++11 support */
 #if defined(HAVE_CPP11_SUPPORT)
-# define DISTRHO_PROPER_CPP11_SUPPORT
+# if HAVE_CPP11_SUPPORT
+#  define DISTRHO_PROPER_CPP11_SUPPORT
+# endif
 #elif __cplusplus >= 201103L || (defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 405) || __has_extension(cxx_noexcept)
 # define DISTRHO_PROPER_CPP11_SUPPORT
 # if (defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) < 407 && ! defined(__clang__)) || (defined(__clang__) && ! __has_extension(cxx_override_control))
diff --git a/utils/pack-macos-cross.sh b/utils/pack-macos-10.06.sh
similarity index 93%
rename from utils/pack-macos-cross.sh
rename to utils/pack-macos-10.06.sh
index 061b496..470457c 100755
--- a/utils/pack-macos-cross.sh
+++ b/utils/pack-macos-10.06.sh
@@ -20,7 +20,7 @@ echo Missing argument
 exit
 fi
 
-sed -i "s|-MD -MP|-D_MD_MP_WORKAROUND|" */*.mk dpf/dgl/*.mk
+sed -i -e "s|-MD -MP|-D_MD_MP_WORKAROUND|" */*.mk dpf/dgl/*.mk
 
 # --------------------------------------------------------------------------------------------------------------------------------
 
@@ -31,7 +31,7 @@ rm -rf tmp/*
 
 NAME="$1"
 
-export CFLAGS="-mmacosx-version-min=10.5 -DMAC_OS_X_VERSION_MAX_ALLOWED=1050 -arch i386 -arch x86_64"
+export CFLAGS="-mmacosx-version-min=10.5 -DMAC_OS_X_VERSION_MAX_ALLOWED=1060 -arch i386 -arch x86_64"
 export CXXFLAGS=$CFLAGS
 export LDFLAGS=$CFLAGS
 export MACOS="true"
diff --git a/utils/pack-macos-10.10.sh b/utils/pack-macos-10.10.sh
new file mode 100755
index 0000000..c7d94ae
--- /dev/null
+++ b/utils/pack-macos-10.10.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+
+set -e
+
+MODGUIS=("Kars" "MVerb" "MVerb" "Nekobi" "PingPongPan")
+
+# --------------------------------------------------------------------------------------------------------------------------------
+# extract debs and pack them
+
+function compressFolderAsZip() {
+rm -f "$1.zip"
+zip -X -r "$1" "$1"
+rm -r "$1"
+}
+
+# --------------------------------------------------------------------------------------------------------------------------------
+
+if [ "$1" == "" ]; then
+echo Missing argument
+exit
+fi
+
+sed -i -e "s|-MD -MP|-D_MD_MP_WORKAROUND|" */*.mk dpf/dgl/*.mk
+
+# --------------------------------------------------------------------------------------------------------------------------------
+
+cd bin
+
+mkdir -p tmp
+rm -rf tmp/*
+
+NAME="$1"
+
+export CFLAGS="-mmacosx-version-min=10.5 -DMAC_OS_X_VERSION_MAX_ALLOWED=1060 -arch i386 -arch x86_64 -DHAVE_CPP11_SUPPORT=0"
+export CXXFLAGS="$CFLAGS"
+export LDFLAGS="$CFLAGS"
+export MACOS="true"
+
+make -C .. clean
+make HAVE_JACK=false HAVE_LIBLO=false HAVE_PROJM=false -C .. -j 4
+rm -rf *ladspa* *dssi*
+mkdir -p "$NAME-macos"
+mv *.lv2 *.vst "$NAME-macos"
+for MODGUI in ${MODGUIS[@]}; do
+  cp -r ../modguis/$MODGUI.modgui/modgui "$NAME-macos"/$MODGUI.lv2/
+  cp ../modguis/$MODGUI.modgui/manifest.ttl "$NAME-macos"/$MODGUI.lv2/modgui.ttl
+done
+cp "../utils/README-MacOS.txt" "$NAME-macos/README.txt"
+compressFolderAsZip "$NAME-macos"
+rm -rf tmp/*
+
+make -C .. clean
+
+cd ..
+
+# --------------------------------------------------------------------------------------------------------------------------------
+
+sed -i -e "s|-D_MD_MP_WORKAROUND|-MD -MP|" */*.mk dpf/dgl/*.mk