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

Fix compilation with GCC

Browse source
This commit is contained in:
Alessandro Ranellucci 2015-12-18 13:40:57 +01:00
parent 44825d91af
commit b8f0391934
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
xs/Build.PL
View file

@ -47,17 +47,16 @@ if (defined $ENV{BOOST_DIR}) {
# In order to generate the -l switches we need to know how Boost libraries are named
my $have_boost = 0;
my @boost_libraries = qw(system thread); # we need these
# check without explicit lib path (works on Linux)
$have_boost = 1
if check_lib(
lib => "boost_system",
INC => join(' ', map "-I$_", @INC, @boost_include),
LIBS => join(' ', map "-L$_", @INC, @boost_libs),
lib => [ map "boost_${_}", @boost_libraries ],
);
if ($have_boost) {
push @LIBS, '-lboost_system', '-lboost_thread';
push @LIBS, map "-l$_", @boost_libraries;
} else {
foreach my $path (@boost_libs) {
my @files = glob "$path/libboost_system*";
@ -66,13 +65,13 @@ if ($have_boost) {
if ($files[0] =~ /libboost_system([^.]+)/) {
my $suffix = $1;
check_lib(
lib => "boost_system$suffix",
lib => [ map "boost_${_}${suffix}", @boost_libraries ],
INC => join(' ', map "-I$_", @INC, @boost_include),
LIBS => "-L$path",
) 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", qw(thread system)); # we need these
push @LIBS, " -L$path", (map " -lboost_$_$suffix", @boost_libraries);
$have_boost = 1;
last;
}