From 5670f5ffb0b6e9f71f347dced558daa0a9f36914 Mon Sep 17 00:00:00 2001
From: Lukas Matena <lukasmatena@seznam.cz>
Date: Fri, 23 Oct 2020 07:51:58 +0200
Subject: [PATCH] Fix couple of build issues on gcc

---
 src/libslic3r/AppConfig.cpp  | 4 ++--
 src/libslic3r/Thread.cpp     | 1 +
 src/slic3r/GUI/GUI_Init.cpp  | 1 +
 src/slic3r/GUI/GUI_Init.hpp  | 5 ++++-
 src/slic3r/GUI/MainFrame.hpp | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/libslic3r/AppConfig.cpp b/src/libslic3r/AppConfig.cpp
index eb8f8bd63..db8176742 100644
--- a/src/libslic3r/AppConfig.cpp
+++ b/src/libslic3r/AppConfig.cpp
@@ -78,9 +78,9 @@ void AppConfig::set_defaults()
             set("single_instance", 
 #ifdef __APPLE__
                 "1"
-#else __APPLE__
+#else // __APPLE__
                 "0"
-#endif __APPLE__
+#endif // __APPLE__
                 );
 
         if (get("remember_output_path").empty())
diff --git a/src/libslic3r/Thread.cpp b/src/libslic3r/Thread.cpp
index d0f0e1991..a78820fe4 100644
--- a/src/libslic3r/Thread.cpp
+++ b/src/libslic3r/Thread.cpp
@@ -11,6 +11,7 @@
 #include <mutex>
 #include <tbb/parallel_for.h>
 #include <tbb/tbb_thread.h>
+#include <tbb/task_scheduler_init.h>
 
 #define SLIC3R_THREAD_NAME_WIN32_MODERN
 
diff --git a/src/slic3r/GUI/GUI_Init.cpp b/src/slic3r/GUI/GUI_Init.cpp
index 09499bbd7..d1c17bc89 100644
--- a/src/slic3r/GUI/GUI_Init.cpp
+++ b/src/slic3r/GUI/GUI_Init.cpp
@@ -14,6 +14,7 @@
 #include <wx/msgdlg.h>
 
 #include <boost/nowide/iostream.hpp>
+#include <boost/nowide/convert.hpp>
 
 namespace Slic3r {
 namespace GUI {
diff --git a/src/slic3r/GUI/GUI_Init.hpp b/src/slic3r/GUI/GUI_Init.hpp
index b1b99b250..c420c9554 100644
--- a/src/slic3r/GUI/GUI_Init.hpp
+++ b/src/slic3r/GUI/GUI_Init.hpp
@@ -1,7 +1,10 @@
 #ifndef slic3r_GUI_Init_hpp_
 #define slic3r_GUI_Init_hpp_
 
+#include <libslic3r/PrintConfig.hpp>
+
 namespace Slic3r {
+
 namespace GUI {
 
 struct GUI_InitParams
@@ -21,4 +24,4 @@ int GUI_Run(GUI_InitParams &params);
 } // namespace GUI
 } // namespace Slic3r
 
-#endif slic3r_GUI_Init_hpp_
+#endif // slic3r_GUI_Init_hpp_
diff --git a/src/slic3r/GUI/MainFrame.hpp b/src/slic3r/GUI/MainFrame.hpp
index 5275ca527..611ea7991 100644
--- a/src/slic3r/GUI/MainFrame.hpp
+++ b/src/slic3r/GUI/MainFrame.hpp
@@ -9,7 +9,7 @@
 #include <wx/filehistory.h>
 #ifdef __APPLE__
 #include <wx/taskbar.h>
-#endif __APPLE__
+#endif // __APPLE__
 
 #include <string>
 #include <map>