3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix of a static library extension of the INtel Thread Building Blocks on OSX/Linux.

Browse Source
This commit is contained in:
bubnikv 2017-03-07 14:13:30 +01:00
parent cb1a6eae1e
commit 32ebb1e2c7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
xs/Build.PL
View File

@ -8,8 +8,8 @@ use ExtUtils::CppGuess;
use Module::Build::WithXSpp; use Module::Build::WithXSpp;
my $cpp_guess = ExtUtils::CppGuess->new; my $cpp_guess = ExtUtils::CppGuess->new;
my $lib_ext = ${$cpp_guess}{config}{lib_ext};
my $mswin = $^O eq 'MSWin32'; my $mswin = $^O eq 'MSWin32';
my $lib_ext = $ENV{SLIC3R_STATIC} ? ($mswin ? '.lib' : '.a') : ${$cpp_guess}{config}{lib_ext};
# Library paths to search for boost, thread building blocks and such. # Library paths to search for boost, thread building blocks and such.
# On Windows, there is really no standard. On Unices, this is a bit better. # On Windows, there is really no standard. On Unices, this is a bit better.
@ -271,7 +271,7 @@ if ($have_tbb) {
} }
push @INC, (map " -I$_", @tbb_include); # TODO: only use the one related to the chosen lib path push @INC, (map " -I$_", @tbb_include); # TODO: only use the one related to the chosen lib path
if ($ENV{SLIC3R_STATIC} || $cpp_guess->is_msvc) { if ($ENV{SLIC3R_STATIC} || $cpp_guess->is_msvc) {
push @LIBS, map "${path}/${_}_static.lib", @tbb_libraries; push @LIBS, map "${path}/${_}_static${suffix}", @tbb_libraries;
} else { } else {
push @LIBS, " -L$path", (map " -l$_$suffix", @tbb_libraries); push @LIBS, " -L$path", (map " -l$_$suffix", @tbb_libraries);
} }