From 9a1834bb86b2cea2b8d26a506ca576918511ee5a Mon Sep 17 00:00:00 2001 From: don bright Date: Sat, 24 Dec 2011 16:39:34 +0100 Subject: boost fix for OPENSCAD_LIBRARIES and BOOSTDIR env vars usage diff --git a/boost.pri b/boost.pri index 2e8e3cb..19e4a64 100644 --- a/boost.pri +++ b/boost.pri @@ -23,9 +23,11 @@ boost { # check for OPENSCAD_LIBDIR + multithread isEmpty(BOOST_LINK_FLAGS) { OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES) - !isEmpty($$OPENSCAD_LIBDIR) { + !isEmpty(OPENSCAD_LIBDIR) { exists($$OPENSCAD_LIBDIR/lib/libboost*thread-mt*) { BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt + } else { + BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options } } } @@ -33,9 +35,11 @@ boost { # check for BOOSTDIR + multithread isEmpty(BOOST_LINK_FLAGS) { BOOST_DIR = $$(BOOSTDIR) - !isEmpty($$BOOST_DIR) { + !isEmpty(BOOST_DIR) { exists($$BOOST_DIR/lib/libboost*thread-mt*) { BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt + } else { + BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options } } } -- cgit v0.10.1