Commit 71a9d8f9 authored by Martin Schultz's avatar Martin Schultz

Revert "Merge branch 'fixIncludeOrder' into 'master'"

changeset was broken for other OSes. use featureGlewSeparation instead

This reverts commit 9b30bc3b, reversing
changes made to 29aa322e.
parent 9b30bc3b
......@@ -55,8 +55,9 @@
//=============================================================================
//== INCLUDES =================================================================
#include "GLState.hh"
#include <ACG/GL/acg_glew.hh>
#include "GLState.hh"
#include <OpenMesh/Core/Utils/vector_cast.hh>
#include <cstring>
......
......@@ -62,12 +62,6 @@
#include <cstdlib>
#include <sstream>
//with the QT_NO_OPENGL define set, Qt will hopefully not undef
//our opengl function macros. if some inclusion clash
//occurs this will cause a compile error (intended)
//if you want to use opengl calls, use separate compilation units
//for Qt and opengl stuff, or make sure this header is included last.
#define QT_NO_OPENGL
#if defined(ARCH_DARWIN)
......
......@@ -46,15 +46,15 @@
* $Date$ *
* *
\*===========================================================================*/
#include "globjects.hh"
#include <QImage>
#include <QGLWidget>
#include <ACG/GL/acg_glew.hh>
#include <ACG/GL/globjects.hh>
#include <ACG/GL/GLFormatInfo.hh>
#include <ACG/ShaderUtils/GLSLShader.hh>
#include <QImage>
#include <QGLWidget>
namespace ACG {
......
......@@ -58,10 +58,9 @@
//== INCLUDES =================================================================
#include "QtBaseViewer.hh"
#include <ACG/GL/acg_glew.hh>
#include "QtBaseViewer.hh"
#include "QtGLGraphicsScene.hh"
#include "QtGLGraphicsView.hh"
#include "QtSceneGraphWidget.hh"
......
......@@ -60,9 +60,10 @@
//== INCLUDES =================================================================
#include "TextNode.hh"
#include <ACG/GL/acg_glew.hh>
#include "TextNode.hh"
//== NAMESPACES ===============================================================
......
......@@ -59,6 +59,7 @@
//== INCLUDES =================================================================
#include <ACG/GL/acg_glew.hh>
#include "QtBaseViewer.hh"
#include "QtGLViewerLayout.hh"
......@@ -104,9 +105,6 @@
# undef min
#endif
#include <ACG/GL/acg_glew.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/ViewObjectMarker.hh>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment