dev 1.0.196 → 1.0.197
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/dev/BoostBuild.rb +4 -4
- metadata +1 -1
data/lib/dev/BoostBuild.rb
CHANGED
|
@@ -30,8 +30,8 @@ class BoostBuild
|
|
|
30
30
|
#flags = flags + "-" + words[3] if words.length == 5
|
|
31
31
|
#result="<toolset>" + getToolset(words[1]) if words.length==4
|
|
32
32
|
link="static"
|
|
33
|
-
link="shared" if filename.index("lib") != 0
|
|
34
|
-
link="shared" if filename.include?(".so")
|
|
33
|
+
link="shared" if filename.index("lib") != 0 && !filename.include?(".a")
|
|
34
|
+
link="shared" if filename.include?(".so") || filename.include?(".dylib")
|
|
35
35
|
result = " <link>" + link + " "
|
|
36
36
|
variant = "release"
|
|
37
37
|
variant = "debug" if filename.include?("d.") || filename.include?("-gd-")
|
|
@@ -60,9 +60,9 @@ class BoostBuild
|
|
|
60
60
|
Dir.glob("*boost_*").each {|f|
|
|
61
61
|
jamfile.puts getJamfileLine(f)
|
|
62
62
|
|
|
63
|
-
# add <link>shared
|
|
63
|
+
# add extra <link>shared entry for windows
|
|
64
64
|
line = getJamfileLine(f)
|
|
65
|
-
if(line.include?("<link>static"))
|
|
65
|
+
if(line.include?("<link>static") && line.include?("-vc") && line.include?(".lib"))
|
|
66
66
|
line = line.gsub("<link>static","<link>shared")
|
|
67
67
|
jamfile.puts line
|
|
68
68
|
end
|