3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 04:31:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge remote-tracking branch 'upstream/master'

Browse source
This commit is contained in:
Vojtech Bubnik 2016-05-03 22:05:31 +02:00
commit d022493297
22 changed files with 106 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

8
xs/Build.PL
View file

@ -55,7 +55,7 @@ $have_boost = 1
lib => [ map "boost_${_}", @boost_libraries ],
);
if ($have_boost) {
if (!$ENV{SLIC3R_STATIC} && $have_boost) {
push @LIBS, map "-lboost_${_}", @boost_libraries;
} else {
foreach my $path (@boost_libs) {
@ -71,7 +71,11 @@ if ($have_boost) {
) or next;
push @INC, (map " -I$_", @boost_include); # TODO: only use the one related to the chosen lib path
push @LIBS, " -L$path", (map " -lboost_$_$suffix", @boost_libraries);
if ($ENV{SLIC3R_STATIC}) {
push @LIBS, map "$path/libboost_$_$suffix.a", @boost_libraries;
} else {
push @LIBS, " -L$path", (map " -lboost_$_$suffix", @boost_libraries);
}
$have_boost = 1;
last;
}