GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-02 06:20:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

ExtUtils::CppGuess considers clang like GCC (+ two minor fixes/additions)

Browse Source
This commit is contained in:
Alessandro Ranellucci 2017-03-06 17:09:09 +01:00
parent ca73765ad7
commit efd9b4c187
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/osx/make_dmg.sh
View File

@ -72,6 +72,8 @@ cp $SLIC3R_DIR/slic3r.pl $macosfolder/slic3r.pl
cp -RP $SLIC3R_DIR/local-lib $macosfolder/local-lib cp -RP $SLIC3R_DIR/local-lib $macosfolder/local-lib
cp -RP $SLIC3R_DIR/lib/* $macosfolder/local-lib/lib/perl5/ cp -RP $SLIC3R_DIR/lib/* $macosfolder/local-lib/lib/perl5/
find $macosfolder/local-lib -name man -type d -delete find $macosfolder/local-lib -name man -type d -delete
find $macosfolder/local-lib -name .packlist -delete
rm -rf $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets/osx_cocoa_3_0_2_uni/include
echo "Relocating dylib paths..." echo "Relocating dylib paths..."
for bundle in $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/auto/Wx/Wx.bundle $(find $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets -name '*.dylib' -type f); do for bundle in $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/auto/Wx/Wx.bundle $(find $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets -name '*.dylib' -type f); do

2
xs/Build.PL
View File

@ -24,9 +24,7 @@ if ($cpp_guess->is_gcc) {
} }
my @ldflags = (); my @ldflags = ();
if ($^O eq 'darwin') { if ($^O eq 'darwin') {
if (!$cpp_guess->is_gcc) {
push @cflags, qw(-stdlib=libc++); push @cflags, qw(-stdlib=libc++);
}
push @ldflags, qw(-framework IOKit -framework CoreFoundation -lc++); push @ldflags, qw(-framework IOKit -framework CoreFoundation -lc++);
# Due to a bug/misconfiguration/stupidity, boost 1.52 and libc++ don't like each # Due to a bug/misconfiguration/stupidity, boost 1.52 and libc++ don't like each

1
xs/MANIFEST
View File

@ -161,7 +161,6 @@ t/19_model.t
t/20_print.t t/20_print.t
t/21_gcode.t t/21_gcode.t
t/22_exception.t t/22_exception.t
t/23_config.t
t/inc/22_config_bad_config_options.ini t/inc/22_config_bad_config_options.ini
xsp/BoundingBox.xsp xsp/BoundingBox.xsp
xsp/BridgeDetector.xsp xsp/BridgeDetector.xsp