juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-31 00:52:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

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
parent f26cb9ebd6 6737506b14
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