Commit 38783ab6 authored by Matthias Möller's avatar Matthias Möller

- add dllexport and fix some linker error for windows

- add includes
- fix gl function names (from no_ext to arb extension)
- rearrange includes, so that glew.h is included before gl.h (through qt5.0) is included
- add some missing file properties

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@19018 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 1abff755
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include "ColorPlugin.hh"
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
...@@ -47,8 +48,6 @@ ...@@ -47,8 +48,6 @@
#include <QtGui> #include <QtGui>
#endif #endif
#include "ColorPlugin.hh"
#include <iostream> #include <iostream>
#include <ACG/GL/GLState.hh> #include <ACG/GL/GLState.hh>
......
...@@ -43,14 +43,6 @@ ...@@ -43,14 +43,6 @@
#ifndef COLORPLUGIN_HH #ifndef COLORPLUGIN_HH
#define COLORPLUGIN_HH #define COLORPLUGIN_HH
#include <QObject>
#include <QMenuBar>
#include "ColorPlugin.hh"
#include "ColorOptions.hh"
#include "OpenFlipper/INIFile/INIFile.hh"
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh> #include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/MenuInterface.hh> #include <OpenFlipper/BasePlugin/MenuInterface.hh>
...@@ -60,6 +52,14 @@ ...@@ -60,6 +52,14 @@
#include "OpenFlipper/BasePlugin/OptionsInterface.hh" #include "OpenFlipper/BasePlugin/OptionsInterface.hh"
#include "OpenFlipper/BasePlugin/INIInterface.hh" #include "OpenFlipper/BasePlugin/INIInterface.hh"
#include <QObject>
#include <QMenuBar>
#include "ColorPlugin.hh"
#include "ColorOptions.hh"
#include "OpenFlipper/INIFile/INIFile.hh"
class ColorPlugin : public QObject, BaseInterface, MenuInterface, ScriptInterface, ToolbarInterface, StatusbarInterface, OptionsInterface, INIInterface class ColorPlugin : public QObject, BaseInterface, MenuInterface, ScriptInterface, ToolbarInterface, StatusbarInterface, OptionsInterface, INIInterface
{ {
......
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