diff options
| author | Marius Kintel <marius@kintel.net> | 2013-03-11 14:24:55 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2013-03-11 14:24:55 (GMT) |
| commit | 6a2967a1f423115a15e619235414124930579359 (patch) | |
| tree | 0abd286a474757e47d5517e97d154a5a43c8fd51 | |
| parent | e868b4a5a178ceb6b340e16151b0f82ec322fc9a (diff) | |
Qt fixes for clang
| -rwxr-xr-x | scripts/macosx-build-dependencies.sh | 4 | ||||
| -rw-r--r-- | setenv_mac-clang.sh | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/scripts/macosx-build-dependencies.sh b/scripts/macosx-build-dependencies.sh index e208fdd..a6963a4 100755 --- a/scripts/macosx-build-dependencies.sh +++ b/scripts/macosx-build-dependencies.sh @@ -51,6 +51,10 @@ build_qt() fi tar xzf qt-everywhere-opensource-src-$version.tar.gz cd qt-everywhere-opensource-src-$version + if $OPTION_CLANG; then + # FIX for clang + sed -i "" -e "s/::TabletProximityRec/TabletProximityRec/g" src/gui/kernel/qt_cocoa_helpers_mac_p.h + fi if $OPTION_32BIT; then QT_32BIT="-arch x86" fi diff --git a/setenv_mac-clang.sh b/setenv_mac-clang.sh index 0dcc51f..7d968e8 100644 --- a/setenv_mac-clang.sh +++ b/setenv_mac-clang.sh @@ -1,11 +1,15 @@ export OPENSCAD_LIBRARIES=$PWD/../libraries/install export DYLD_LIBRARY_PATH=$OPENSCAD_LIBRARIES/lib +export DYLD_FRAMEWORK_PATH=$OPENSCAD_LIBRARIES/lib export QMAKESPEC=unsupported/macx-clang #export OPENCSGDIR=$PWD/../OpenCSG-1.3.0 #export CGALDIR=$PWD/../install/CGAL-3.6 #export DYLD_LIBRARY_PATH=$OPENCSGDIR/lib +# Our own Qt +export PATH=$OPENSCAD_LIBRARIES/bin:$PATH + # ccache: export PATH=/opt/local/libexec/ccache:$PATH export CCACHE_BASEDIR=$PWD/.. |