vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix issue with boost and Apple namespace pollution

export-menu
Marius Kintel 2014-02-04 01:22:02 -05:00
parent b80c6c7bf4
commit 00d20bb5ac
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boost.pri
View File

@ -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

10
setenv_mac-qt5.sh Normal file
View File

@ -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/..

2
src/AppleEvents.cc
View File

@ -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: