diff options
| author | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-01-09 02:29:24 (GMT) |
| commit | 23f6b0623c86eba96dfb1296b862522cf02b0734 (patch) | |
| tree | 998500ef16763f6f08f9f7cb8917c98b1643af68 /boost.pri | |
| parent | 52dfffd97ba49b603b4814d843cd9be08d040364 (diff) | |
| parent | 5044ea928d72da800d11b2b80f6148265c13d10f (diff) | |
Merge branch 'master' into threading
Conflicts:
RELEASE_NOTES
Diffstat (limited to 'boost.pri')
| -rw-r--r-- | boost.pri | 16 |
1 files changed, 8 insertions, 8 deletions
@@ -13,11 +13,11 @@ boost { DEFINES += BOOST_STATIC DEFINES += BOOST_THREAD_USE_LIB DEFINES += Boost_USE_STATIC_LIBS - BOOST_LINK_FLAGS = -lboost_thread_win32-mt -lboost_program_options-mt + BOOST_LINK_FLAGS = -lboost_thread_win32-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt } isEmpty(BOOST_LINK_FLAGS):win32 { - BOOST_LINK_FLAGS = -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1 + BOOST_LINK_FLAGS = -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1 -llibboost_filesystem-vc90-mt-s-1_46_1 -llibboost_system-vc90-mt-s-1_46_1 -llibboost_regex-vc90-mt-s-1_46_1 } # check for OPENSCAD_LIBDIR + multithread @@ -25,10 +25,10 @@ boost { OPENSCAD_LIBDIR = $$(OPENSCAD_LIBRARIES) !isEmpty(OPENSCAD_LIBDIR) { exists($$OPENSCAD_LIBDIR/lib/libboost*thread-mt*) { - BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt + BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt } else { exists($$OPENSCAD_LIBDIR/lib/libboost*thread*) { - BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options + BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options -lboost_filesystem -lboost_system -lboost_regex } } } @@ -39,10 +39,10 @@ boost { BOOST_DIR = $$(BOOSTDIR) !isEmpty(BOOST_DIR) { exists($$BOOST_DIR/lib/libboost*thread-mt*) { - BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt + BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt } else { exists($$BOOST_DIR/lib/libboost*thread*) { - BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options + BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options -lboost_filesystem -lboost_system -lboost_regex } } } @@ -54,14 +54,14 @@ boost { BMT_TEST2 = /usr/lib/libboost*thread-mt* BMT_TEST3 = /usr/pkg/lib/libboost*thread-mt* # netbsd exists($$BMT_TEST1)|exists($$BMT_TEST2)|exists($$BMT_TEST3) { - BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt + BOOST_LINK_FLAGS = -lboost_thread-mt -lboost_program_options-mt -lboost_filesystem-mt -lboost_system-mt -lboost_regex-mt } } } isEmpty(BOOST_LINK_FLAGS) { unix|macx { - BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options + BOOST_LINK_FLAGS = -lboost_thread -lboost_program_options -lboost_filesystem -lboost_system -lboost_regex } } |