Commit 7095cbe4 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 7c3dc1e0
......@@ -44,12 +44,8 @@
#ifndef FILEINTERFACE_HH
#define FILEINTERFACE_HH
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
#include <QtGui>
#endif
class QWidget;
#include <QString>
#include <OpenFlipper/common/Types.hh>
......
......@@ -49,6 +49,7 @@
#include <QStringList>
#include <QList>
#include <QDockWidget>
#include <QToolBar>
struct KeyBinding{
int key;
......
......@@ -34,16 +34,18 @@
/*===========================================================================*\
* *
* $Revision: 18440 $ *
* $LastChangedBy: moebius $ *
* $Date: 2014-04-08 08:26:27 +0200 (Tue, 08 Apr 2014) $ *
* $Revision$ *
* $LastChangedBy$ *
* $Date$ *
* *
\*===========================================================================*/
#include "glew_wrappers.hh"
#include <GL/glew.h>
#include <stdio.h>
void initGlew() {
DLLEXPORT void initGlew() {
GLenum err = glewInit();
if (GLEW_OK != err)
{
......@@ -52,6 +54,6 @@ void initGlew() {
}
}
const char *getGlewVersion() {
DLLEXPORT const char * getGlewVersion() {
return (const char *)glewGetString(GLEW_VERSION);
}
......@@ -34,16 +34,18 @@
/*===========================================================================*\
* *
* $Revision: 18440 $ *
* $LastChangedBy: moebius $ *
* $Date: 2014-04-08 08:26:27 +0200 (Tue, 08 Apr 2014) $ *
* $Revision$ *
* $LastChangedBy$ *
* $Date$ *
* *
\*===========================================================================*/
#ifndef GLEW_WRAPPERS_HH_
#define GLEW_WRAPPERS_HH_
void initGlew();
const char *getGlewVersion();
#include <OpenFlipper/common/GlobalDefines.hh>
DLLEXPORT void initGlew();
DLLEXPORT const char * getGlewVersion();
#endif /* GLEW_WRAPPERS_HH_ */
......@@ -40,6 +40,7 @@
* *
\*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -54,7 +55,7 @@
#include <iostream>
#include <OpenFlipper/common/Types.hh>
#include "../OpenFlipper/BasePlugin/PluginFunctions.hh"
......
......@@ -39,14 +39,13 @@
* $Date$ *
* *
\*===========================================================================*/
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include "PluginDialog.hh"
#include <QMessageBox>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
const QColor PluginDialog::blockColor_ = QColor(228, 155, 18);
const QColor PluginDialog::unloadColor_ = QColor(172, 172, 172);
const QColor PluginDialog::loadedBuiltInColor_ = QColor(208, 240, 192);
......
......@@ -46,6 +46,8 @@
#ifndef ADDEMPTYWIDGET_HH
#define ADDEMPTYWIDGET_HH
#include <OpenFlipper/common/Types.hh>
#include "ui_addEmpty.hh"
#if QT_VERSION >= 0x050000
......@@ -55,7 +57,7 @@
#endif
#include "OpenFlipper/common/Types.hh"
class addEmptyWidget : public QDialog, public Ui::addEmpty
{
......
......@@ -8,11 +8,13 @@
#ifndef FILEPICKER_HH_
#define FILEPICKER_HH_
#include <OpenFlipper/common/RecentFiles.hh>
#include <QWidget>
#include <QComboBox>
#include <QLineEdit>
#include <QPushButton>
#include <OpenFlipper/common/RecentFiles.hh>
class DLLEXPORT FilePicker : public QWidget {
Q_OBJECT
......
......@@ -40,6 +40,8 @@
* *
\*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -48,9 +50,6 @@
#endif
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
class FileOptionsDialog : public QDialog
{
Q_OBJECT
......
......@@ -40,6 +40,8 @@
* *
\*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
......@@ -49,8 +51,6 @@
#include <QDirModel>
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
#include <map>
class LoadWidget : public QFileDialog
......
......@@ -40,12 +40,12 @@
* *
\*===========================================================================*/
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include "optionsWidget.hh"
#include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include "ShortcutButton.hh"
#include <QMessageBox>
......
......@@ -42,16 +42,16 @@
#include "optionsWidget.hh"
#include <iostream>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include <OpenFlipper/ACGHelper/DrawModeConverter.hh>
#include <OpenFlipper/INIFile/INIFile.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include <ACG/GL/ShaderCache.hh>
#include "optionsWidget.hh"
#include <iostream>
#include <QColorDialog>
#include <QMessageBox>
......
......@@ -46,6 +46,9 @@
#ifndef OPTIONSWIDGET_HH
#define OPTIONSWIDGET_HH
#include <OpenFlipper/Core/PluginInfo.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include "ui_optionsWidget.hh"
#if QT_VERSION >= 0x050000
......@@ -58,8 +61,6 @@
#include <QProgressDialog>
#include <QtNetwork>
#include <OpenFlipper/Core/PluginInfo.hh>
#include <ACG/Scenegraph/DrawModes.hh>
//map for keyBindings
typedef std::multimap< std::pair< QObject*, int >, std::pair< int, Qt::KeyboardModifiers > > InverseKeyMap;
......
......@@ -34,12 +34,16 @@
/*===========================================================================*\
* *
* $Revision: 15910 $ *
* $LastChangedBy: moeller $ *
* $Date: 2012-12-05 12:53:39 +0100 (Mi, 05 Dez 2012) $ *
* $Revision$ *
* $LastChangedBy$ *
* $Date$ *
* *
\*===========================================================================*/
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/RendererInfo.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#if QT_VERSION >= 0x050000
#include <QtWidgets>
#else
......@@ -50,10 +54,6 @@
#include <functional>
#include <algorithm>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/RendererInfo.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QMenu>
......
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