mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-10-02 13:20:59 +00:00
Drop the OS-Specific Includes Added Outside Their Platform Guards
GLib, GTK, D-Bus and POSIX headers are only used inside platform #if blocks, which already include them. Added unconditionally at the top of the file they broke the Windows build.
This commit is contained in:
@@ -6,8 +6,6 @@
|
|||||||
#include <Standard_TypeDef.hxx>
|
#include <Standard_TypeDef.hxx>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <sys/types.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
|
|
||||||
#ifndef _WIN32 // POSIX Unix-domain-socket transport only (slice 1)
|
#ifndef _WIN32 // POSIX Unix-domain-socket transport only (slice 1)
|
||||||
|
|
||||||
|
|||||||
@@ -24,7 +24,6 @@
|
|||||||
#include <set>
|
#include <set>
|
||||||
#include "slic3r/GUI/Widgets/StaticLine.hpp"
|
#include "slic3r/GUI/Widgets/StaticLine.hpp"
|
||||||
#include "slic3r/GUI/BedShapeDialog.hpp"
|
#include "slic3r/GUI/BedShapeDialog.hpp"
|
||||||
#include <sys/types.h>
|
|
||||||
#include "slic3r/GUI/wxExtensions.hpp"
|
#include "slic3r/GUI/wxExtensions.hpp"
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|||||||
@@ -11,7 +11,6 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include "libslic3r/Config.hpp"
|
#include "libslic3r/Config.hpp"
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <sys/types.h>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <set>
|
#include <set>
|
||||||
#include <unordered_map>
|
#include <unordered_map>
|
||||||
|
|||||||
@@ -6,7 +6,6 @@
|
|||||||
#include <boost/nowide/convert.hpp>
|
#include <boost/nowide/convert.hpp>
|
||||||
#include <boost/filesystem/operations.hpp>
|
#include <boost/filesystem/operations.hpp>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <exception>
|
#include <exception>
|
||||||
#include "libslic3r_version.h"
|
#include "libslic3r_version.h"
|
||||||
|
|||||||
@@ -53,8 +53,6 @@
|
|||||||
#include <boost/optional/optional.hpp>
|
#include <boost/optional/optional.hpp>
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
#include <boost/none.hpp>
|
#include <boost/none.hpp>
|
||||||
#include <glib-object.h>
|
|
||||||
#include <glib.h>
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <cmath>
|
#include <cmath>
|
||||||
#include <climits>
|
#include <climits>
|
||||||
@@ -90,9 +88,7 @@
|
|||||||
#include <wx/chartype.h>
|
#include <wx/chartype.h>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <wx/app.h>
|
#include <wx/app.h>
|
||||||
#include <sys/stat.h>
|
|
||||||
#include <wx/busycursor.h>
|
#include <wx/busycursor.h>
|
||||||
#include <unistd.h>
|
|
||||||
#include <wx/debug.h>
|
#include <wx/debug.h>
|
||||||
#include <wx/anybutton.h>
|
#include <wx/anybutton.h>
|
||||||
#include <wx/clntdata.h>
|
#include <wx/clntdata.h>
|
||||||
|
|||||||
@@ -26,8 +26,6 @@
|
|||||||
#include <wx/image.h>
|
#include <wx/image.h>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
#include <gtk/gtkcssprovider.h>
|
|
||||||
#include <glib-object.h>
|
|
||||||
#include <fstream>
|
#include <fstream>
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|||||||
@@ -7,9 +7,7 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <dbus/dbus-shared.h>
|
|
||||||
#include <wx/string.h>
|
#include <wx/string.h>
|
||||||
#include <dbus/dbus-protocol.h>
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
|
|||||||
@@ -4,8 +4,6 @@
|
|||||||
#include "slic3r/GUI/Event.hpp"
|
#include "slic3r/GUI/Event.hpp"
|
||||||
#include <wx/gdicmn.h>
|
#include <wx/gdicmn.h>
|
||||||
#include <wx/dcclient.h>
|
#include <wx/dcclient.h>
|
||||||
#include <gdk/gdk.h>
|
|
||||||
#include <glib-object.h>
|
|
||||||
#include "libslic3r/Utils.hpp"
|
#include "libslic3r/Utils.hpp"
|
||||||
#include "slic3r/GUI/GUI_Utils.hpp"
|
#include "slic3r/GUI/GUI_Utils.hpp"
|
||||||
#include <wx/filehistory.h>
|
#include <wx/filehistory.h>
|
||||||
|
|||||||
@@ -58,7 +58,6 @@
|
|||||||
#include <vector>
|
#include <vector>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp"
|
#include "slic3r/GUI/Jobs/UpgradeNetworkJob.hpp"
|
||||||
#include <sys/types.h>
|
|
||||||
#include <wx/mediactrl.h>
|
#include <wx/mediactrl.h>
|
||||||
#include <wx/panel.h>
|
#include <wx/panel.h>
|
||||||
#include <wx/utils.h>
|
#include <wx/utils.h>
|
||||||
|
|||||||
@@ -24,7 +24,6 @@
|
|||||||
#include <map>
|
#include <map>
|
||||||
#include <boost/algorithm/string/trim.hpp>
|
#include <boost/algorithm/string/trim.hpp>
|
||||||
#include <ios>
|
#include <ios>
|
||||||
#include <sys/select.h>
|
|
||||||
#include <wx/app.h>
|
#include <wx/app.h>
|
||||||
#include <cstdlib>
|
#include <cstdlib>
|
||||||
#include <wx/glcanvas.h>
|
#include <wx/glcanvas.h>
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include "libslic3r/Preset.hpp"
|
#include "libslic3r/Preset.hpp"
|
||||||
#include "libslic3r/Config.hpp"
|
#include "libslic3r/Config.hpp"
|
||||||
#include <glib.h>
|
|
||||||
#include <map>
|
#include <map>
|
||||||
#include <iterator>
|
#include <iterator>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
|
|||||||
@@ -14,9 +14,7 @@
|
|||||||
#include <boost/nowide/convert.hpp>
|
#include <boost/nowide/convert.hpp>
|
||||||
#include <boost/log/trivial.hpp>
|
#include <boost/log/trivial.hpp>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <sys/types.h>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
#include <unistd.h>
|
|
||||||
#include <wx/utils.h>
|
#include <wx/utils.h>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
#include <system_error>
|
#include <system_error>
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
#include "Label.hpp"
|
#include "Label.hpp"
|
||||||
#include "StaticBox.hpp"
|
#include "StaticBox.hpp"
|
||||||
#include <wx/font.h>
|
#include <wx/font.h>
|
||||||
#include <strings.h>
|
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <wx/dlimpexp.h>
|
#include <wx/dlimpexp.h>
|
||||||
#include <wx/dc.h>
|
#include <wx/dc.h>
|
||||||
|
|||||||
@@ -8,10 +8,7 @@
|
|||||||
|
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
#include <glib.h>
|
|
||||||
#include <gio/gio.h>
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <glib-object.h>
|
|
||||||
#include <exception>
|
#include <exception>
|
||||||
#include <thread>
|
#include <thread>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user