3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-10-20 15:21:21 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'feature_slice_to_png' of github.com:prusa3d/Slic3r into feature_slice_to_png

Browse source 
# Conflicts:
#	xs/src/slic3r/AppController.cpp
#	xs/src/slic3r/AppController.hpp
This commit is contained in:
tamasmeszaros 2018-06-25 17:13:36 +02:00
commit 99f6866a1d
6 changed files with 414 additions and 239 deletions
Download patch file Download diff file Expand all files Collapse all files

1
xs/CMakeLists.txt
View file

@ -265,6 +265,7 @@ add_library(libslic3r_gui STATIC
${LIBDIR}/slic3r/IProgressIndicator.hpp
${LIBDIR}/slic3r/AppController.hpp
${LIBDIR}/slic3r/AppController.cpp
${LIBDIR}/slic3r/AppControllerWx.cpp
)
add_library(admesh STATIC