diff options
author | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 18:29:29 (GMT) |
---|---|---|
committer | Brad Pitcher <bradpitcher@gmail.com> | 2011-11-01 18:29:29 (GMT) |
commit | 0eacddfd8148f14ee0ddfe2eb66b82774c88afbe (patch) | |
tree | 6982ea59564090ea858d12d86d3699e83887f1f9 /boost.pri | |
parent | ea7e4988d44249946b620d5973b230cf1a0606ca (diff) | |
parent | e2caf3726d68ff1fef63113519049abffc0563af (diff) |
merge master
Diffstat (limited to 'boost.pri')
-rw-r--r-- | boost.pri | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -1,4 +1,5 @@ boost { + isEmpty(DEPLOYDIR) { # Optionally specify location of boost using the # BOOSTDIR env. variable @@ -11,9 +12,11 @@ boost { } CONFIG(mingw-cross-env) { + DEFINES += BOOST_STATIC + DEFINES += BOOST_THREAD_USE_LIB + DEFINES += Boost_USE_STATIC_LIBS LIBS += -lboost_thread_win32-mt -lboost_program_options-mt - } - else { + } else { win32 { LIBS += -llibboost_thread-vc90-mt-s-1_46_1 -llibboost_program_options-vc90-mt-s-1_46_1 } else { |