Commit 9ae65530 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 91b46d53
...@@ -40,6 +40,18 @@ ...@@ -40,6 +40,18 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include "FileSTL.hh"
#include <ACG/GL/GLState.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else #else
...@@ -49,17 +61,7 @@ ...@@ -49,17 +61,7 @@
#include <QFileInfo> #include <QFileInfo>
#include <QSettings> #include <QSettings>
#include "FileSTL.hh"
#include <iostream> #include <iostream>
#include <ACG/GL/GLState.hh>
#include "OpenFlipper/BasePlugin/PluginFunctions.hh"
#include "OpenFlipper/common/GlobalOptions.hh"
#include <OpenMesh/Core/IO/IOManager.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
/// Constructor /// Constructor
FileSTLPlugin::FileSTLPlugin() : FileSTLPlugin::FileSTLPlugin() :
......
...@@ -45,6 +45,9 @@ ...@@ -45,6 +45,9 @@
#define FILESTLPLUGIN_HH #define FILESTLPLUGIN_HH
#include <QObject> #include <QObject>
class QCheckBox;
class QLabel;
class QSpinBox;
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh> #include <OpenFlipper/BasePlugin/BaseInterface.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