GitHub-Proxy/PrusaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/prusa3d/PrusaSlicer.git synced 2025-08-13 23:15:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix CMake compilation on OS X

Browse Source
This commit is contained in:
Alessandro Ranellucci 2016-06-22 17:19:04 +02:00
parent a3ad66824c
commit 9d1fb2e854
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "-DM_PI=3.14159265358979323846 -D_GLIBCXX_USE_C99 -DHAS_BOOL
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
IF(CMAKE_HOST_APPLE) IF(CMAKE_HOST_APPLE)
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -framework IOKit -framework CoreFoundation") set(CMAKE_EXE_LINKER_FLAGS "-framework IOKit -framework CoreFoundation")
ELSE(CMAKE_HOST_APPLE) ELSE(CMAKE_HOST_APPLE)
set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++") set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")
ENDIF(CMAKE_HOST_APPLE) ENDIF(CMAKE_HOST_APPLE)
@ -89,7 +89,7 @@ include_directories(${Boost_INCLUDE_DIRS})
#find_package(wxWidgets) #find_package(wxWidgets)
#disable wx for the time being - we're not building any of the gui yet #disable wx for the time being - we're not building any of the gui yet
IF(CMAKE_HOST_UNIX) IF(CMAKE_HOST_UNIX)
set(Boost_LIBRARIES bsystem bthread) #set(Boost_LIBRARIES bsystem bthread)
ENDIF(CMAKE_HOST_UNIX) ENDIF(CMAKE_HOST_UNIX)
IF(wxWidgets_FOUND) IF(wxWidgets_FOUND)
MESSAGE("wx found!") MESSAGE("wx found!")

1
xs/src/libslic3r/SVGExport.cpp
View File

@ -9,7 +9,6 @@ namespace Slic3r {
SVGExport::SVGExport(TriangleMesh &t, float layerheight, float firstlayerheight) SVGExport::SVGExport(TriangleMesh &t, float layerheight, float firstlayerheight)
:t(&t), sliced(false) :t(&t), sliced(false)
{ {
heights={};
if(layerheight>0){ if(layerheight>0){
for(float f=firstlayerheight;f<=t.stl.stats.max.z;f+=layerheight){ for(float f=firstlayerheight;f<=t.stl.stats.max.z;f+=layerheight){
heights.push_back(f); heights.push_back(f);