Fix couple of build issues on gcc
This commit is contained in:
parent
9a4376ddc6
commit
5670f5ffb0
@ -78,9 +78,9 @@ void AppConfig::set_defaults()
|
|||||||
set("single_instance",
|
set("single_instance",
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
"1"
|
"1"
|
||||||
#else __APPLE__
|
#else // __APPLE__
|
||||||
"0"
|
"0"
|
||||||
#endif __APPLE__
|
#endif // __APPLE__
|
||||||
);
|
);
|
||||||
|
|
||||||
if (get("remember_output_path").empty())
|
if (get("remember_output_path").empty())
|
||||||
|
@ -11,6 +11,7 @@
|
|||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <tbb/parallel_for.h>
|
#include <tbb/parallel_for.h>
|
||||||
#include <tbb/tbb_thread.h>
|
#include <tbb/tbb_thread.h>
|
||||||
|
#include <tbb/task_scheduler_init.h>
|
||||||
|
|
||||||
#define SLIC3R_THREAD_NAME_WIN32_MODERN
|
#define SLIC3R_THREAD_NAME_WIN32_MODERN
|
||||||
|
|
||||||
|
@ -14,6 +14,7 @@
|
|||||||
#include <wx/msgdlg.h>
|
#include <wx/msgdlg.h>
|
||||||
|
|
||||||
#include <boost/nowide/iostream.hpp>
|
#include <boost/nowide/iostream.hpp>
|
||||||
|
#include <boost/nowide/convert.hpp>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
#ifndef slic3r_GUI_Init_hpp_
|
#ifndef slic3r_GUI_Init_hpp_
|
||||||
#define slic3r_GUI_Init_hpp_
|
#define slic3r_GUI_Init_hpp_
|
||||||
|
|
||||||
|
#include <libslic3r/PrintConfig.hpp>
|
||||||
|
|
||||||
namespace Slic3r {
|
namespace Slic3r {
|
||||||
|
|
||||||
namespace GUI {
|
namespace GUI {
|
||||||
|
|
||||||
struct GUI_InitParams
|
struct GUI_InitParams
|
||||||
@ -21,4 +24,4 @@ int GUI_Run(GUI_InitParams ¶ms);
|
|||||||
} // namespace GUI
|
} // namespace GUI
|
||||||
} // namespace Slic3r
|
} // namespace Slic3r
|
||||||
|
|
||||||
#endif slic3r_GUI_Init_hpp_
|
#endif // slic3r_GUI_Init_hpp_
|
||||||
|
@ -9,7 +9,7 @@
|
|||||||
#include <wx/filehistory.h>
|
#include <wx/filehistory.h>
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
#include <wx/taskbar.h>
|
#include <wx/taskbar.h>
|
||||||
#endif __APPLE__
|
#endif // __APPLE__
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <map>
|
#include <map>
|
||||||
|
Loading…
Reference in New Issue
Block a user