3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disabling calls from libslic3r to slic3r gui.

Browse Source
This commit is contained in:
bubnikv 2018-09-19 11:27:04 +02:00
parent 0558b53493
commit 6bd92a8198
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -95,6 +95,11 @@ if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals" ) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fext-numeric-literals" )
endif() endif()
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
# On GCC and Clang, no return from a non-void function is a warning only. Here, we make it an error.
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type" )
endif()
# Where all the bundled libraries reside? # Where all the bundled libraries reside?
set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/) set(LIBDIR ${CMAKE_CURRENT_SOURCE_DIR}/src/)
# For the bundled boost libraries (boost::nowide) # For the bundled boost libraries (boost::nowide)

3
src/libslic3r/Format/3mf.cpp
View File

@ -667,7 +667,8 @@ namespace Slic3r {
add_error("Error while reading config data to buffer"); add_error("Error while reading config data to buffer");
return; return;
} }
bundle.load_config_string(buffer.data(), archive_filename.c_str()); //FIXME Get rid of the dependencies on slic3r GUI library!
// bundle.load_config_string(buffer.data(), archive_filename.c_str());
} }
} }

3
src/libslic3r/Format/AMF.cpp
View File

@ -467,7 +467,8 @@ void AMFParserContext::endElement(const char * /* name */)
case NODE_TYPE_METADATA: case NODE_TYPE_METADATA:
if ((m_preset_bundle != nullptr) && strncmp(m_value[0].c_str(), SLIC3R_CONFIG_TYPE, strlen(SLIC3R_CONFIG_TYPE)) == 0) { if ((m_preset_bundle != nullptr) && strncmp(m_value[0].c_str(), SLIC3R_CONFIG_TYPE, strlen(SLIC3R_CONFIG_TYPE)) == 0) {
m_preset_bundle->load_config_string(m_value[1].c_str(), m_archive_filename.c_str()); //FIXME Get rid of the dependencies on slic3r GUI library!
// m_preset_bundle->load_config_string(m_value[1].c_str(), m_archive_filename.c_str());
} }
else if (strncmp(m_value[0].c_str(), "slic3r.", 7) == 0) { else if (strncmp(m_value[0].c_str(), "slic3r.", 7) == 0) {
const char *opt_key = m_value[0].c_str() + 7; const char *opt_key = m_value[0].c_str() + 7;

2
src/slic3r/GUI/GLToolbar.hpp
View File

@ -2,7 +2,7 @@
#define slic3r_GLToolbar_hpp_ #define slic3r_GLToolbar_hpp_
#include "../../slic3r/GUI/GLTexture.hpp" #include "../../slic3r/GUI/GLTexture.hpp"
#include "../../callback.hpp" #include "callback.hpp"
#include <string> #include <string>
#include <vector> #include <vector>

2
src/slic3r/GUI/GUI.hpp
View File

@ -4,7 +4,7 @@
#include <string> #include <string>
#include <vector> #include <vector>
#include "PrintConfig.hpp" #include "PrintConfig.hpp"
#include "../../callback.hpp" #include "callback.hpp"
#include "GUI_ObjectParts.hpp" #include "GUI_ObjectParts.hpp"
#include <wx/intl.h> #include <wx/intl.h>