mirror of https://github.com/vitalif/openscad
Fix issue with boost and Apple namespace pollution
parent
b80c6c7bf4
commit
00d20bb5ac
|
@ -9,6 +9,8 @@ boost {
|
||||||
win*: QMAKE_LIBDIR += -L$$BOOST_DIR/lib
|
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) {
|
CONFIG(mingw-cross-env) {
|
||||||
DEFINES += BOOST_STATIC
|
DEFINES += BOOST_STATIC
|
||||||
DEFINES += BOOST_THREAD_USE_LIB
|
DEFINES += BOOST_THREAD_USE_LIB
|
||||||
|
|
|
@ -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/..
|
|
@ -24,7 +24,7 @@ void installAppleEventHandlers()
|
||||||
{
|
{
|
||||||
// Reload handler
|
// Reload handler
|
||||||
OSErr err = AEInstallEventHandler('SCAD', 'relo', NewAEEventHandlerUPP(eventHandler), 0, true);
|
OSErr err = AEInstallEventHandler('SCAD', 'relo', NewAEEventHandlerUPP(eventHandler), 0, true);
|
||||||
require_noerr(err, CantInstallAppleEventHandler);
|
__Require_noErr(err, CantInstallAppleEventHandler);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
CantInstallAppleEventHandler:
|
CantInstallAppleEventHandler:
|
||||||
|
|
Loading…
Reference in New Issue