mirror of
				https://github.com/SoftFever/OrcaSlicer.git
				synced 2025-10-30 20:21:12 -06:00 
			
		
		
		
	include "libslic3r" from slic3r project directly, not as "../../libslicer"
(rely on -Ilibslic3r set correctly) for the slic3r project.
This commit is contained in:
		
							parent
							
								
									8d78b23c78
								
							
						
					
					
						commit
						4eaca91f11
					
				
					 12 changed files with 24 additions and 23 deletions
				
			
		|  | @ -12,10 +12,10 @@ | |||
| #include <boost/property_tree/ini_parser.hpp> | ||||
| #include <boost/property_tree/ptree.hpp> | ||||
| 
 | ||||
| #include "../../libslic3r/libslic3r.h" | ||||
| #include "../../libslic3r/Config.hpp" | ||||
| #include "../../libslic3r/FileParserError.hpp" | ||||
| #include "../../libslic3r/Utils.hpp" | ||||
| #include "libslic3r/libslic3r.h" | ||||
| #include "libslic3r/Config.hpp" | ||||
| #include "libslic3r/FileParserError.hpp" | ||||
| #include "libslic3r/Utils.hpp" | ||||
| 
 | ||||
| #define SLIC3R_SNAPSHOTS_DIR "snapshots" | ||||
| #define SLIC3R_SNAPSHOT_FILE "snapshot.ini" | ||||
|  |  | |||
|  | @ -4,10 +4,10 @@ | |||
| #include <boost/algorithm/string/trim.hpp> | ||||
| #include <boost/nowide/fstream.hpp> | ||||
| 
 | ||||
| #include "../../libslic3r/libslic3r.h" | ||||
| #include "../../libslic3r/Config.hpp" | ||||
| #include "../../libslic3r/FileParserError.hpp" | ||||
| #include "../../libslic3r/Utils.hpp" | ||||
| #include "libslic3r/libslic3r.h" | ||||
| #include "libslic3r/Config.hpp" | ||||
| #include "libslic3r/FileParserError.hpp" | ||||
| #include "libslic3r/Utils.hpp" | ||||
| 
 | ||||
| namespace Slic3r {  | ||||
| namespace GUI { | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ | |||
| 
 | ||||
| #include <boost/filesystem.hpp> | ||||
| 
 | ||||
| #include "../../libslic3r/FileParserError.hpp" | ||||
| #include "libslic3r/FileParserError.hpp" | ||||
| #include "../Utils/Semver.hpp" | ||||
| 
 | ||||
| namespace Slic3r {  | ||||
|  |  | |||
|  | @ -1,5 +1,5 @@ | |||
| #include "../../libslic3r/libslic3r.h" | ||||
| #include "../../libslic3r/Utils.hpp" | ||||
| #include "libslic3r/libslic3r.h" | ||||
| #include "libslic3r/Utils.hpp" | ||||
| #include "AppConfig.hpp" | ||||
| 
 | ||||
| #include <stdio.h> | ||||
|  |  | |||
|  | @ -6,8 +6,8 @@ | |||
|     #include <wx/wx.h> | ||||
| #endif | ||||
| 
 | ||||
| #include "../../libslic3r/libslic3r.h" | ||||
| #include "../../libslic3r/Config.hpp" | ||||
| #include "libslic3r/libslic3r.h" | ||||
| #include "libslic3r/Config.hpp" | ||||
| 
 | ||||
| #include "GUI.hpp" | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| #ifndef slic3r_GLCanvas3DManager_hpp_ | ||||
| #define slic3r_GLCanvas3DManager_hpp_ | ||||
| 
 | ||||
| #include "../../libslic3r/BoundingBox.hpp" | ||||
| #include "libslic3r/BoundingBox.hpp" | ||||
| 
 | ||||
| #include <map> | ||||
| #include <vector> | ||||
|  |  | |||
|  | @ -5,8 +5,8 @@ | |||
| 
 | ||||
| #include "../../slic3r/GUI/GLTexture.hpp" | ||||
| #include "../../slic3r/GUI/GLCanvas3D.hpp" | ||||
| #include "../../libslic3r/Point.hpp" | ||||
| #include "../../libslic3r/BoundingBox.hpp" | ||||
| #include "libslic3r/Point.hpp" | ||||
| #include "libslic3r/BoundingBox.hpp" | ||||
| 
 | ||||
| #include <array> | ||||
| #include <vector> | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ | |||
| 
 | ||||
| #include "GLShader.hpp" | ||||
| 
 | ||||
| #include "../../libslic3r/Utils.hpp" | ||||
| #include "libslic3r/Utils.hpp" | ||||
| #include <boost/nowide/fstream.hpp> | ||||
| 
 | ||||
| #include <string> | ||||
|  |  | |||
|  | @ -1,8 +1,8 @@ | |||
| #ifndef slic3r_GLShader_hpp_ | ||||
| #define slic3r_GLShader_hpp_ | ||||
| 
 | ||||
| #include "../../libslic3r/libslic3r.h" | ||||
| #include "../../libslic3r/Point.hpp" | ||||
| #include "libslic3r/libslic3r.h" | ||||
| #include "libslic3r/Point.hpp" | ||||
| 
 | ||||
| namespace Slic3r { | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,7 +1,8 @@ | |||
| #include "../../libslic3r/Point.hpp" | ||||
| #include "libslic3r/Point.hpp" | ||||
| #include "libslic3r/libslic3r.h" | ||||
| 
 | ||||
| #include "GLToolbar.hpp" | ||||
| 
 | ||||
| #include "../../libslic3r/libslic3r.h" | ||||
| #include "../../slic3r/GUI/GLCanvas3D.hpp" | ||||
| 
 | ||||
| #include <GL/glew.h> | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ | |||
| #define slic3r_GUI_Preview_hpp_ | ||||
| 
 | ||||
| #include <wx/panel.h> | ||||
| #include "../../libslic3r/Point.hpp" | ||||
| #include "libslic3r/Point.hpp" | ||||
| 
 | ||||
| #include <string> | ||||
| 
 | ||||
|  |  | |||
|  | @ -10,7 +10,7 @@ | |||
| 
 | ||||
| #include <curl/curl.h> | ||||
| 
 | ||||
| #include "../../libslic3r/libslic3r.h" | ||||
| #include "libslic3r/libslic3r.h" | ||||
| 
 | ||||
| namespace fs = boost::filesystem; | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 bubnikv
						bubnikv