From 46709c92cd023f3860350b8242617bc794d743a9 Mon Sep 17 00:00:00 2001 From: bubnikv Date: Tue, 29 Jan 2019 08:57:00 +0100 Subject: [PATCH 1/2] Fix of OcctoPrint using Post Processor does not work #1731 --- src/slic3r/GUI/BackgroundSlicingProcess.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/slic3r/GUI/BackgroundSlicingProcess.cpp b/src/slic3r/GUI/BackgroundSlicingProcess.cpp index 4ef020bf8d..463be8397e 100644 --- a/src/slic3r/GUI/BackgroundSlicingProcess.cpp +++ b/src/slic3r/GUI/BackgroundSlicingProcess.cpp @@ -437,12 +437,10 @@ void BackgroundSlicingProcess::prepare_upload() if (m_print == m_fff_print) { m_print->set_status(95, "Running post-processing scripts"); - run_post_process_scripts(source_path.string(), m_fff_print->config()); - if (copy_file(m_temp_output_path, source_path.string()) != 0) { throw std::runtime_error("Copying of the temporary G-code to the output G-code failed"); } - + run_post_process_scripts(source_path.string(), m_fff_print->config()); m_upload_job.upload_data.upload_path = m_fff_print->print_statistics().finalize_output_path(m_upload_job.upload_data.upload_path.string()); } else { m_sla_print->export_raster(source_path.string()); From c4bc45cff4951435502144ee5cd630dff4ea113a Mon Sep 17 00:00:00 2001 From: bubnikv Date: Tue, 29 Jan 2019 09:57:17 +0100 Subject: [PATCH 2/2] Add DEBUG and _DEBUG symbols on OSX & Linux in a way the Visual Studio does that. --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4e599f362..4e42e24e96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -85,6 +85,12 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED ON) +if(NOT WIN32) + # Add DEBUG flags for the debug builds in a way the Visual Studio adds these flags. + add_compile_options("$<$:-DDEBUG>") + add_compile_options("$<$:-D_DEBUG>") +endif() + # To be able to link libslic3r with the Perl XS module. # Once we get rid of Perl and libslic3r is linked statically, we can get rid of -fPIC set(CMAKE_POSITION_INDEPENDENT_CODE ON)