Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_gcode_viewer

This commit is contained in:
enricoturri1966 2020-05-22 12:12:56 +02:00
commit 80c2f107c1
28 changed files with 1208 additions and 52 deletions

View file

@ -306,7 +306,7 @@ if(WIN32)
endif()
if(SLIC3R_PROFILE)
target_link_libraries(slic3r Shiny)
target_link_libraries(libslic3r Shiny)
endif()
if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)