boost/build
2
0
Fork 0
mirror of https://github.com/boostorg/build.git synced 2026-02-15 00:52:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix: correct library names of static Qt on Windows.

Browse Source 
Static Qt libraries do not have the "4" suffix.
And it is not necessary to enhance the dll path when using static libraries.

[SVN r78801]
This commit is contained in:
Jürgen Hunold
2012-06-03 15:13:05 +00:00
parent 3cf875e93b
commit 40dcb724bf
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
v2/tools/qt4.jam
View File

@@ -297,13 +297,19 @@ rule init ( prefix : full_bin ? : full_inc ? : full_lib ? : version ? : conditio
# Setup common pre-built Qt.
# Special setup for QtCore on which everything depends
{
local link = [ feature.get-values link : $(condition) ] ;
local usage-requirements =
<include>$(.incprefix)
<library-path>$(.libprefix)
<dll-path>$(.libprefix)
<threading>multi
<allow>qt4 ;
if $(link) in shared
{
usage-requirements += <dll-path>$(.libprefix) ;
}
local suffix ;
# Since Qt-4.2, debug versions on unix have to be built
@@ -323,8 +329,11 @@ rule init ( prefix : full_bin ? : full_inc ? : full_lib ? : version ? : conditio
{
.have_separate_debug = TRUE ;
# On NT, the libs have "4" suffix, and "d" suffix in debug builds.
.suffix_version = "4" ;
# On NT, the shared libs have "4" suffix, and "d" suffix in debug builds.
if $(link) in shared
{
.suffix_version = "4" ;
}
.suffix_debug = "d" ;
# On Windows we must link against the qtmain library