3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

include "libslic3r" from slic3r project directly, not as "../../libslicer"

Browse source 
(rely on -Ilibslic3r set correctly) for the slic3r project.
This commit is contained in:
bubnikv 2018-12-06 12:52:28 +01:00
parent 8d78b23c78
commit 4eaca91f11
12 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/slic3r/Config/Snapshot.cpp
View file

@ -12,10 +12,10 @@
#include <boost/property_tree/ini_parser.hpp> #include <boost/property_tree/ini_parser.hpp>
#include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree.hpp>
#include "../../libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "../../libslic3r/Config.hpp" #include "libslic3r/Config.hpp"
#include "../../libslic3r/FileParserError.hpp" #include "libslic3r/FileParserError.hpp"
#include "../../libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#define SLIC3R_SNAPSHOTS_DIR "snapshots" #define SLIC3R_SNAPSHOTS_DIR "snapshots"
#define SLIC3R_SNAPSHOT_FILE "snapshot.ini" #define SLIC3R_SNAPSHOT_FILE "snapshot.ini"

8
src/slic3r/Config/Version.cpp
View file

@ -4,10 +4,10 @@
#include <boost/algorithm/string/trim.hpp> #include <boost/algorithm/string/trim.hpp>
#include <boost/nowide/fstream.hpp> #include <boost/nowide/fstream.hpp>
#include "../../libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "../../libslic3r/Config.hpp" #include "libslic3r/Config.hpp"
#include "../../libslic3r/FileParserError.hpp" #include "libslic3r/FileParserError.hpp"
#include "../../libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
namespace Slic3r { namespace Slic3r {
namespace GUI { namespace GUI {

2
src/slic3r/Config/Version.hpp
View file

@ -6,7 +6,7 @@
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include "../../libslic3r/FileParserError.hpp" #include "libslic3r/FileParserError.hpp"
#include "../Utils/Semver.hpp" #include "../Utils/Semver.hpp"
namespace Slic3r { namespace Slic3r {

4
src/slic3r/GUI/AppConfig.cpp
View file

@ -1,5 +1,5 @@
#include "../../libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "../../libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include "AppConfig.hpp" #include "AppConfig.hpp"
#include <stdio.h> #include <stdio.h>

4
src/slic3r/GUI/BitmapCache.hpp
View file

@ -6,8 +6,8 @@
#include <wx/wx.h> #include <wx/wx.h>
#endif #endif
#include "../../libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "../../libslic3r/Config.hpp" #include "libslic3r/Config.hpp"
#include "GUI.hpp" #include "GUI.hpp"

2
src/slic3r/GUI/GLCanvas3DManager.hpp
View file

@ -1,7 +1,7 @@
#ifndef slic3r_GLCanvas3DManager_hpp_ #ifndef slic3r_GLCanvas3DManager_hpp_
#define slic3r_GLCanvas3DManager_hpp_ #define slic3r_GLCanvas3DManager_hpp_
#include "../../libslic3r/BoundingBox.hpp" #include "libslic3r/BoundingBox.hpp"
#include <map> #include <map>
#include <vector> #include <vector>

4
src/slic3r/GUI/GLGizmo.hpp
View file

@ -5,8 +5,8 @@
#include "../../slic3r/GUI/GLTexture.hpp" #include "../../slic3r/GUI/GLTexture.hpp"
#include "../../slic3r/GUI/GLCanvas3D.hpp" #include "../../slic3r/GUI/GLCanvas3D.hpp"
#include "../../libslic3r/Point.hpp" #include "libslic3r/Point.hpp"
#include "../../libslic3r/BoundingBox.hpp" #include "libslic3r/BoundingBox.hpp"
#include <array> #include <array>
#include <vector> #include <vector>

2
src/slic3r/GUI/GLShader.cpp
View file

@ -2,7 +2,7 @@
#include "GLShader.hpp" #include "GLShader.hpp"
#include "../../libslic3r/Utils.hpp" #include "libslic3r/Utils.hpp"
#include <boost/nowide/fstream.hpp> #include <boost/nowide/fstream.hpp>
#include <string> #include <string>

4
src/slic3r/GUI/GLShader.hpp
View file

@ -1,8 +1,8 @@
#ifndef slic3r_GLShader_hpp_ #ifndef slic3r_GLShader_hpp_
#define slic3r_GLShader_hpp_ #define slic3r_GLShader_hpp_
#include "../../libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
#include "../../libslic3r/Point.hpp" #include "libslic3r/Point.hpp"
namespace Slic3r { namespace Slic3r {

5
src/slic3r/GUI/GLToolbar.cpp
View file

@ -1,7 +1,8 @@
#include "../../libslic3r/Point.hpp" #include "libslic3r/Point.hpp"
#include "libslic3r/libslic3r.h"
#include "GLToolbar.hpp" #include "GLToolbar.hpp"
#include "../../libslic3r/libslic3r.h"
#include "../../slic3r/GUI/GLCanvas3D.hpp" #include "../../slic3r/GUI/GLCanvas3D.hpp"
#include <GL/glew.h> #include <GL/glew.h>

2
src/slic3r/GUI/GUI_Preview.hpp
View file

@ -2,7 +2,7 @@
#define slic3r_GUI_Preview_hpp_ #define slic3r_GUI_Preview_hpp_
#include <wx/panel.h> #include <wx/panel.h>
#include "../../libslic3r/Point.hpp" #include "libslic3r/Point.hpp"
#include <string> #include <string>

2
src/slic3r/Utils/Http.cpp
View file

@ -10,7 +10,7 @@
#include <curl/curl.h> #include <curl/curl.h>
#include "../../libslic3r/libslic3r.h" #include "libslic3r/libslic3r.h"
namespace fs = boost::filesystem; namespace fs = boost::filesystem;