From 8ca4bcc9b582629f7f3bba04c2566ee8b99bc5c5 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@gmail.com>
Date: Mon, 19 May 2014 01:44:51 +0100
Subject: [PATCH] More osx stuff

---
 data/macos/build-deps.sh | 65 +++++++++++++++++++++++++++++++++++++++-
 data/macos/build.sh      |  3 +-
 data/macos/env-vars.sh   |  4 +--
 3 files changed, 68 insertions(+), 4 deletions(-)

diff --git a/data/macos/build-deps.sh b/data/macos/build-deps.sh
index 76259e4e5..8f8e85228 100755
--- a/data/macos/build-deps.sh
+++ b/data/macos/build-deps.sh
@@ -107,7 +107,7 @@ curl -O http://download.qt-project.org/official_releases/qt/4.8/4.8.6/qt-everywh
 tar -xf qt-everywhere-opensource-src-4.8.6.tar.gz
 fi
 
-if [ ! -f qt-everywhere-opensource-src-4.8.6/fltk-config ]; then
+if [ ! -f qt-everywhere-opensource-src-4.8.6/bin/moc ]; then
 cd qt-everywhere-opensource-src-4.8.6
 ./configure -prefix /opt/kxstudio -release -static -opensource -confirm-license -force-pkg-config -no-framework \
             -qt-freetype -qt-libjpeg -qt-libpng -qt-sql-sqlite -qt-zlib -harfbuzz -svg \
@@ -120,6 +120,69 @@ sudo make install
 cd ..
 fi
 
+# ------------------------------------------------------------------------------------
+# python
+
+if [ ! -d Python-3.3.5 ]; then
+curl -O https://www.python.org/ftp/python/3.3.5/Python-3.3.5.tgz
+tar -xf Python-3.3.5.tgz
+fi
+
+if [ ! -f Python-3.3.5/Makefile ]; then
+cd Python-3.3.5
+./configure --prefix=/opt/kxstudio
+make
+sudo make install
+cd ..
+fi
+
+# ------------------------------------------------------------------------------------
+# sip
+
+if [ ! -d sip-4.15.5 ]; then
+curl -L http://download.sourceforge.net/pyqt/sip-4.15.5.tar.gz -o sip-4.15.5.tar.gz
+tar -xf sip-4.15.5.tar.gz
+fi
+
+if [ ! -f sip-4.15.5/Makefile ]; then
+cd sip-4.15.5
+python3 configure.py
+make
+sudo make install
+cd ..
+fi
+
+# ------------------------------------------------------------------------------------
+# pyqt
+
+if [ ! -d PyQt-mac-gpl-4.10.4 ]; then
+curl -L http://download.sourceforge.net/pyqt/PyQt-mac-gpl-4.10.4.tar.gz -o PyQt-mac-gpl-4.10.4.tar.gz
+tar -xf PyQt-mac-gpl-4.10.4.tar.gz
+fi
+
+if [ ! -f PyQt-mac-gpl-4.10.4/Makefile ]; then
+cd PyQt-mac-gpl-4.10.4
+python3 configure.py -g --confirm-license --no-deprecated
+make
+sudo make install
+cd ..
+fi
+
+# ------------------------------------------------------------------------------------
+# cxfreeze
+
+if [ ! -d cx_Freeze-4.3.3 ]; then
+curl -L http://download.sourceforge.net/cx-freeze/cx_Freeze-4.3.3.tar.gz -o cx_Freeze-4.3.3.tar.gz
+tar -xf cx_Freeze-4.3.3.tar.gz
+fi
+
+if [ ! -d cx_Freeze-4.3.3/build ]; then
+cd cx_Freeze-4.3.3
+python3 setup.py build
+sudo python3 setup.py install --prefix=/opt/kxstudio
+cd ..
+fi
+
 # ------------------------------------------------------------------------------------
 # fftw3
 
diff --git a/data/macos/build.sh b/data/macos/build.sh
index 6995e1dbd..8c57daab1 100755
--- a/data/macos/build.sh
+++ b/data/macos/build.sh
@@ -16,7 +16,7 @@ if [ -d /dev/shm ]; then
 else
   # MacOS
   . ./data/macos/env-vars.sh
-  export CXFREEZE=cxfreeze-3.3
+  export CXFREEZE=cxfreeze
 fi
 
 # ./configure -prefix /Users/falktx/Source/Qt-5.2.1 -release -opensource -confirm-license -no-c++11 
@@ -34,6 +34,7 @@ fi
 rm -rf ./data/macos/Carla
 
 cp ./source/carla ./source/carla.pyw
+# python3 ./data/macos/bundle.py bdist_mac --bundle-name=Carla 
 $CXFREEZE --include-modules=re,sip,subprocess,inspect --target-dir=./data/macos/Carla ./source/carla.pyw
 rm ./source/carla.pyw
 
diff --git a/data/macos/env-vars.sh b/data/macos/env-vars.sh
index e6dcae088..3f0619d66 100755
--- a/data/macos/env-vars.sh
+++ b/data/macos/env-vars.sh
@@ -7,5 +7,5 @@ export CXXFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5 -DMAC_OS_
 export PATH=/opt/kxstudio/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
 export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig
 
-export PYRCC="pyrcc4-3.3 -py3"
-export PYUIC="pyuic4-3.3 -w"
+# export PYRCC="pyrcc4-3.3 -py3"
+# export PYUIC="pyuic4-3.3 -w"