From ba89a3d1abaf760022d9f41c0331dd361ddfded7 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Thu, 28 Mar 2019 11:20:48 +0100 Subject: [PATCH 1/2] Removed dependency on libz on Windows. --- src/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7599f68a0..45d6f8196 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -97,7 +97,10 @@ if (SLIC3R_GUI) # Configure libcurl and its dependencies OpenSSL & zlib find_package(CURL REQUIRED) - find_package(ZLIB REQUIRED) + if (NOT MSVC) + # Required by libcurl + find_package(ZLIB REQUIRED) + endif() target_include_directories(slic3r PRIVATE ${CURL_INCLUDE_DIRS}) target_link_libraries(slic3r ${CURL_LIBRARIES} ${ZLIB_LIBRARIES}) if (SLIC3R_STATIC) From d209aaa2007d3a58f4b5650226b6eef7a7d5f230 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Thu, 28 Mar 2019 11:24:21 +0100 Subject: [PATCH 2/2] Enabled slicing of SLA from the command line. --- src/slic3r.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/slic3r.cpp b/src/slic3r.cpp index 3b301ec2a..5198eeaa3 100644 --- a/src/slic3r.cpp +++ b/src/slic3r.cpp @@ -389,8 +389,7 @@ int CLI::run(int argc, char **argv) outfile_final = fff_print.print_statistics().finalize_output_path(outfile); } else { outfile = sla_print.output_filepath(outfile); - //FIXME Tamas, please port it to miniz - // sla_print.export_raster(outfile); + sla_print.export_raster(outfile); outfile_final = sla_print.print_statistics().finalize_output_path(outfile); } if (outfile != outfile_final && Slic3r::rename_file(outfile, outfile_final) != 0) {