Update mac stuff

data/macos/build.sh

@@ -16,6 +16,7 @@ if [ -d /dev/shm ]; then
 else
   # MacOS
   . ./data/macos/env-vars.sh
+  export CXFREEZE=cxfreeze-3.3
 fi
 
 # ./configure -prefix /Users/falktx/Source/Qt-5.2.1 -release -opensource -confirm-license -no-c++11 
@@ -24,23 +25,25 @@ fi
 # -no-compile-examples -nomake examples -nomake tests -make tools -make libs -qt-sql-sqlite -no-framework -no-sql-odbc
 
 # Clean build
-make clean
+# make clean
 
 # Build
-make $JOBS HAVE_FFMPEG=false HAVE_GTK2=false HAVE_GTK3=false
-
-# rm -rf ./data/macos/build
+# make $JOBS
 
 # Build Mac App
-# cd data/macos
-# python3.3 setup.py build
-# cxfreeze-3.3 --target-dir=./data/macos/Carla ./source/carla.py --include-modules=re,sip
+rm -rf ./data/macos/Carla
+
+cp ./source/carla ./source/carla.pyw
+$CXFREEZE --include-modules=re,sip,subprocess,inspect --target-dir=./data/macos/Carla ./source/carla.pyw
+rm ./source/carla.pyw
 
-# mkdir build/backend
-# mkdir build/bridges
-# mkdir build/discovery
-# cp ../../source/backend/*.dylib             build/backend/
-# cp ../../source/discovery/carla-discovery-* build/discovery/
+cd data/macos
 
-# cd ../..
+mkdir Carla/backend
+mkdir Carla/bridges
+mkdir Carla/discovery
+cp ../../source/backend/*.dylib             Carla/backend/
+cp ../../source/discovery/carla-discovery-* Carla/discovery/
+cp -r ../../source/modules/theme/styles     Carla/
 
+cd ../..

data/macos/env-vars.sh

@@ -4,6 +4,7 @@ export MACOS="true"
 export CC="gcc-4.2"
 export CXX="g++-4.2"
 export CXXFLAGS="-DMAC_OS_X_VERSION_MIN_REQUIRED=MAC_OS_X_VERSION_10_5 -DMAC_OS_X_VERSION_MAX_ALLOWED=MAC_OS_X_VERSION_10_5"
+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"