diff options
| author | Marius Kintel <marius@kintel.net> | 2014-02-04 06:22:02 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2014-02-04 06:22:02 (GMT) |
| commit | 00d20bb5ac94e64700216e046f6650542b9bb187 (patch) | |
| tree | 0b9704eb8280da2df4a4ee350c27315d6fa480bd | |
| parent | b80c6c7bf46fd896e24787f91d7663346a8f9287 (diff) | |
Fix issue with boost and Apple namespace pollution
| -rw-r--r-- | boost.pri | 2 | ||||
| -rw-r--r-- | setenv_mac-qt5.sh | 10 | ||||
| -rw-r--r-- | src/AppleEvents.cc | 2 |
3 files changed, 13 insertions, 1 deletions
@@ -9,6 +9,8 @@ boost { win*: QMAKE_LIBDIR += -L$$BOOST_DIR/lib } + # See https://svn.boost.org/trac/boost/ticket/6219 + macx: DEFINES += __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORES=0 CONFIG(mingw-cross-env) { DEFINES += BOOST_STATIC DEFINES += BOOST_THREAD_USE_LIB diff --git a/setenv_mac-qt5.sh b/setenv_mac-qt5.sh new file mode 100644 index 0000000..d7b4338 --- /dev/null +++ b/setenv_mac-qt5.sh @@ -0,0 +1,10 @@ +export OPENSCAD_LIBRARIES=$PWD/../libraries/homebrew +export DYLD_LIBRARY_PATH=$OPENSCAD_LIBRARIES/lib +export DYLD_FRAMEWORK_PATH=$OPENSCAD_LIBRARIES/lib + +# Our own Qt +export PATH=$OPENSCAD_LIBRARIES/bin:$PATH + +# ccache: +export PATH=/opt/local/libexec/ccache:$PATH +export CCACHE_BASEDIR=$PWD/.. diff --git a/src/AppleEvents.cc b/src/AppleEvents.cc index 3102792..39aba9d 100644 --- a/src/AppleEvents.cc +++ b/src/AppleEvents.cc @@ -24,7 +24,7 @@ void installAppleEventHandlers() { // Reload handler OSErr err = AEInstallEventHandler('SCAD', 'relo', NewAEEventHandlerUPP(eventHandler), 0, true); - require_noerr(err, CantInstallAppleEventHandler); + __Require_noErr(err, CantInstallAppleEventHandler); return; CantInstallAppleEventHandler: |