Browse Source

Change osx prefix to carla (instead of kxstudio)

tags/1.9.4
falkTX 10 years ago
parent
commit
086f0d086f
3 changed files with 16 additions and 23 deletions
  1. +7
    -7
      data/macos/build-deps.sh
  2. +9
    -9
      data/macos/build.sh
  3. +0
    -7
      data/macos/env-vars.sh

+ 7
- 7
data/macos/build-deps.sh View File

@@ -25,7 +25,7 @@ export CFLAGS="-O2 -mtune=generic -msse -msse2 -m$ARCH -fPIC -DPIC"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m$ARCH"

export PREFIX=/opt/kxstudio$ARCH
export PREFIX=/opt/carla$ARCH
export PATH=$PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig

@@ -159,7 +159,7 @@ if [ ! -f qtbase5-mac10.6_32/build-done ]; then
export CFLAGS="-O2 -mtune=generic -msse -msse2 -m32 -fPIC -DPIC"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m32"
export PREFIX=/opt/kxstudio32
export PREFIX=/opt/carla32
export PATH=$PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
cp -r qtbase5-mac10.6 qtbase5-mac10.6_32
@@ -187,7 +187,7 @@ if [ ! -f qtbase5-mac10.6_64/build-done ]; then
export CFLAGS="-O2 -mtune=generic -msse -msse2 -m64 -fPIC -DPIC"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m64"
export PREFIX=/opt/kxstudio64
export PREFIX=/opt/carla64
export PATH=$PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
cp -r qtbase5-mac10.6 qtbase5-mac10.6_64
@@ -215,7 +215,7 @@ export CFLAGS="-O2 -mtune=generic -msse -msse2 -m64 -fPIC -DPIC"
export CXXFLAGS=$CFLAGS
export LDFLAGS="-m64"

export PREFIX=/opt/kxstudio
export PREFIX=/opt/carla
export PATH=$PREFIX/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig

@@ -245,9 +245,9 @@ cd qtbase-opensource-src-5.2.1
-no-compile-examples -nomake examples -nomake tests -make libs -make tools
make -j 2
sudo make install
sudo ln -s /opt/kxstudio/lib/QtCore.framework/Headers /opt/kxstudio/include/qt5/QtCore
sudo ln -s /opt/kxstudio/lib/QtGui.framework/Headers /opt/kxstudio/include/qt5/QtGui
sudo ln -s /opt/kxstudio/lib/QtWidgets.framework/Headers /opt/kxstudio/include/qt5/QtWidgets
sudo ln -s /opt/carla/lib/QtCore.framework/Headers /opt/carla/include/qt5/QtCore
sudo ln -s /opt/carla/lib/QtGui.framework/Headers /opt/carla/include/qt5/QtGui
sudo ln -s /opt/carla/lib/QtWidgets.framework/Headers /opt/carla/include/qt5/QtWidgets
touch build-done
cd ..
fi


+ 9
- 9
data/macos/build.sh View File

@@ -11,24 +11,24 @@ fi
export MACOS="true"
export CC=clang
export CXX=clang++
export CXFREEZE=/opt/kxstudio/bin/cxfreeze
export CXFREEZE=/opt/carla/bin/cxfreeze

# Build python stuff
export PATH=/opt/kxstudio/bin:/opt/kxstudio64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=/opt/kxstudio/lib/pkgconfig:/opt/kxstudio64/lib/pkgconfig
export PATH=/opt/carla/bin:/opt/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=/opt/carla/lib/pkgconfig:/opt/carla64/lib/pkgconfig
make $JOBS UI RES WIDGETS

# Build theme
make $JOBS theme

# Build everything else
export PATH=/opt/kxstudio64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=/opt/kxstudio64/lib/pkgconfig
export PATH=/opt/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=/opt/carla64/lib/pkgconfig
make backend $JOBS
make $JOBS

# Build Mac App
export PATH=/opt/kxstudio/bin:/opt/kxstudio64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PATH=/opt/carla/bin:/opt/carla64/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PYTHONPATH=`pwd`/source
unset PKG_CONFIG_PATH

@@ -64,9 +64,9 @@ mv plugin/* Carla.app/Contents/MacOS/resources/
rmdir plugin

cd Carla.app/Contents/MacOS/styles
install_name_tool -change "/opt/kxstudio/lib/QtCore.framework/Versions/5/QtCore" @loader_path/../QtCore carlastyle.dylib
install_name_tool -change "/opt/kxstudio/lib/QtGui.framework/Versions/5/QtGui" @loader_path/../QtGui carlastyle.dylib
install_name_tool -change "/opt/kxstudio/lib/QtWidgets.framework/Versions/5/QtWidgets" @loader_path/../QtWidgets carlastyle.dylib
install_name_tool -change "/opt/carla/lib/QtCore.framework/Versions/5/QtCore" @loader_path/../QtCore carlastyle.dylib
install_name_tool -change "/opt/carla/lib/QtGui.framework/Versions/5/QtGui" @loader_path/../QtGui carlastyle.dylib
install_name_tool -change "/opt/carla/lib/QtWidgets.framework/Versions/5/QtWidgets" @loader_path/../QtWidgets carlastyle.dylib
cd ../../../..

mkdir ../build-lv2


+ 0
- 7
data/macos/env-vars.sh View File

@@ -1,7 +0,0 @@
#!/bin/bash

export MACOS="true"
export CC=clang
export CXX=clang++
export PATH=/opt/kxstudio64/bin:/opt/kxstudio/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin
export PKG_CONFIG_PATH=/opt/kxstudio64/lib/pkgconfig

Loading…
Cancel
Save