summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThales Lima Oliveira <thaleslima.ufu@gmail.com>2020-06-02 22:11:57 -0300
committerThales Lima Oliveira <thaleslima.ufu@gmail.com>2020-06-02 22:11:57 -0300
commit3e44546bc23d9c9ad6fa801f92ced7503b6ea9aa (patch)
treeadf9344f54ffc5f03b23266742f13faf4954e15a
parent113a35d0fe8938973fa1c100b77f456ed250e61b (diff)
downloadPSP.git-3e44546bc23d9c9ad6fa801f92ced7503b6ea9aa.tar.gz
PSP.git-3e44546bc23d9c9ad6fa801f92ced7503b6ea9aa.tar.xz
PSP.git-3e44546bc23d9c9ad6fa801f92ced7503b6ea9aa.zip
Readaptation to non-msw compilers
-rw-r--r--Project/ControlEditor.h2
-rw-r--r--Project/Element.h2
-rw-r--r--Project/OpenGLText.h2
-rw-r--r--Project/Text.h2
-rw-r--r--Project/Workspace.h3
5 files changed, 11 insertions, 0 deletions
diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h
index 2aed0e9..c68829d 100644
--- a/Project/ControlEditor.h
+++ b/Project/ControlEditor.h
@@ -23,7 +23,9 @@
#include <wx/dcclient.h>
#include <wx/dcscreen.h>
#include <wx/graphics.h>
+#ifdef _MSC_VER
#include <windows.h>
+#endif
#include <GL/gl.h>
#include <GL/glu.h>
diff --git a/Project/Element.h b/Project/Element.h
index 2c845ec..9199b63 100644
--- a/Project/Element.h
+++ b/Project/Element.h
@@ -24,7 +24,9 @@
#include <wx/menu.h>
#include <wx/stdpaths.h>
#include <wx/filename.h>
+#ifdef _MSC_VER
#include <windows.h>
+#endif
#include <GL/gl.h>
#include <wx/graphics.h>
diff --git a/Project/OpenGLText.h b/Project/OpenGLText.h
index 885782e..2ec7ab1 100644
--- a/Project/OpenGLText.h
+++ b/Project/OpenGLText.h
@@ -18,7 +18,9 @@
#ifndef OPENGLTEXT_H
#define OPENGLTEXT_H
+#ifdef _MSC_VER
#include <windows.h>
+#endif
#include <GL/gl.h>
#include <wx/dcmemory.h>
#include <algorithm>
diff --git a/Project/Text.h b/Project/Text.h
index 2f4c0ff..3fc1431 100644
--- a/Project/Text.h
+++ b/Project/Text.h
@@ -18,7 +18,9 @@
#ifndef TEXT_H
#define TEXT_H
+#ifdef _MSC_VER
#include <windows.h>
+#endif
#include <GL/gl.h>
#include <wx/dcmemory.h>
diff --git a/Project/Workspace.h b/Project/Workspace.h
index 3ac9b3a..b397db9 100644
--- a/Project/Workspace.h
+++ b/Project/Workspace.h
@@ -18,7 +18,10 @@
#ifndef WORKSPACE_H
#define WORKSPACE_H
+#ifdef _MSC_VER
#include <windows.h>
+#endif
+
#include <GL/gl.h>
#include <GL/glu.h>
#include <wx/dcclient.h>