Commit 5d87bcec authored by Matthias Möller's avatar Matthias Möller
Browse files

- 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 bffecfe5
...@@ -46,6 +46,7 @@ ...@@ -46,6 +46,7 @@
#include "DrawMesh.hh" #include "DrawMesh.hh"
#include <ACG/GL/gl.hh>
#include <ACG/Geometry/GPUCacheOptimizer.hh> #include <ACG/Geometry/GPUCacheOptimizer.hh>
#include <ACG/GL/VertexDeclaration.hh> #include <ACG/GL/VertexDeclaration.hh>
#include <ACG/GL/ShaderCache.hh> #include <ACG/GL/ShaderCache.hh>
...@@ -1413,7 +1414,7 @@ void ACG::DrawMeshT<Mesh>::addTriRenderObjects(IRenderer* _renderer, const Rende ...@@ -1413,7 +1414,7 @@ void ACG::DrawMeshT<Mesh>::addTriRenderObjects(IRenderer* _renderer, const Rende
} }
else // no texture map specified, use whatever texture is currently bound to the first texture stage else // no texture map specified, use whatever texture is currently bound to the first texture stage
{ {
glActiveTexture(GL_TEXTURE0); glActiveTextureARB(GL_TEXTURE0);
GLint textureID = 0; GLint textureID = 0;
glGetIntegerv(GL_TEXTURE_BINDING_2D, &textureID); glGetIntegerv(GL_TEXTURE_BINDING_2D, &textureID);
......
...@@ -174,7 +174,7 @@ public: ...@@ -174,7 +174,7 @@ public:
//== CLASS DEFINITION ========================================================= //== CLASS DEFINITION =========================================================
class Texture class ACGDLLEXPORT Texture
{ {
public: public:
...@@ -341,7 +341,7 @@ public: ...@@ -341,7 +341,7 @@ public:
#if defined(GL_ARB_texture_buffer_object) #if defined(GL_ARB_texture_buffer_object)
class TextureBuffer : public Texture class ACGDLLEXPORT TextureBuffer : public Texture
{ {
public: public:
TextureBuffer(GLenum u=GL_NONE) TextureBuffer(GLenum u=GL_NONE)
......
...@@ -39,16 +39,16 @@ ...@@ -39,16 +39,16 @@
* $Date$ * * $Date$ *
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <ObjectTypes/Light/LightNode.hh>
#include <ui_lightWidget.hh> #include <ui_lightWidget.hh>
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else #else
#include <QtGui> #include <QtGui>
#endif #endif
#include <ObjectTypes/Light/LightNode.hh>
#include <OpenFlipper/common/GlobalDefines.hh> #include <OpenFlipper/common/GlobalDefines.hh>
#include "Light.hh" #include "Light.hh"
......
...@@ -44,12 +44,8 @@ ...@@ -44,12 +44,8 @@
#ifndef FILEINTERFACE_HH #ifndef FILEINTERFACE_HH
#define FILEINTERFACE_HH #define FILEINTERFACE_HH
class QWidget;
#if QT_VERSION >= 0x050000 #include <QString>
#include <QtWidgets>
#else
#include <QtGui>
#endif
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
......
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
#include <QStringList> #include <QStringList>
#include <QList> #include <QList>
#include <QDockWidget> #include <QDockWidget>
#include <QToolBar>
struct KeyBinding{ struct KeyBinding{
int key; int key;
......
...@@ -34,16 +34,18 @@ ...@@ -34,16 +34,18 @@
/*===========================================================================*\ /*===========================================================================*\
* * * *
* $Revision: 18440 $ * * $Revision$ *
* $LastChangedBy: moebius $ * * $LastChangedBy$ *
* $Date: 2014-04-08 08:26:27 +0200 (Tue, 08 Apr 2014) $ * * $Date$ *
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include "glew_wrappers.hh"
#include <GL/glew.h> #include <GL/glew.h>
#include <stdio.h> #include <stdio.h>
void initGlew() { DLLEXPORT void initGlew() {
GLenum err = glewInit(); GLenum err = glewInit();
if (GLEW_OK != err) if (GLEW_OK != err)
{ {
...@@ -52,6 +54,6 @@ void initGlew() { ...@@ -52,6 +54,6 @@ void initGlew() {
} }
} }
const char *getGlewVersion() { DLLEXPORT const char * getGlewVersion() {
return (const char *)glewGetString(GLEW_VERSION); return (const char *)glewGetString(GLEW_VERSION);
} }
...@@ -34,16 +34,18 @@ ...@@ -34,16 +34,18 @@
/*===========================================================================*\ /*===========================================================================*\
* * * *
* $Revision: 18440 $ * * $Revision$ *
* $LastChangedBy: moebius $ * * $LastChangedBy$ *
* $Date: 2014-04-08 08:26:27 +0200 (Tue, 08 Apr 2014) $ * * $Date$ *
* * * *
\*===========================================================================*/ \*===========================================================================*/
#ifndef GLEW_WRAPPERS_HH_ #ifndef GLEW_WRAPPERS_HH_
#define GLEW_WRAPPERS_HH_ #define GLEW_WRAPPERS_HH_
void initGlew(); #include <OpenFlipper/common/GlobalDefines.hh>
const char *getGlewVersion();
DLLEXPORT void initGlew();
DLLEXPORT const char * getGlewVersion();
#endif /* GLEW_WRAPPERS_HH_ */ #endif /* GLEW_WRAPPERS_HH_ */
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
...@@ -54,7 +55,7 @@ ...@@ -54,7 +55,7 @@
#include <iostream> #include <iostream>
#include <OpenFlipper/common/Types.hh>
#include "../OpenFlipper/BasePlugin/PluginFunctions.hh" #include "../OpenFlipper/BasePlugin/PluginFunctions.hh"
......
...@@ -39,14 +39,13 @@ ...@@ -39,14 +39,13 @@
* $Date$ * * $Date$ *
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include "PluginDialog.hh" #include "PluginDialog.hh"
#include <QMessageBox> #include <QMessageBox>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
const QColor PluginDialog::blockColor_ = QColor(228, 155, 18); const QColor PluginDialog::blockColor_ = QColor(228, 155, 18);
const QColor PluginDialog::unloadColor_ = QColor(172, 172, 172); const QColor PluginDialog::unloadColor_ = QColor(172, 172, 172);
const QColor PluginDialog::loadedBuiltInColor_ = QColor(208, 240, 192); const QColor PluginDialog::loadedBuiltInColor_ = QColor(208, 240, 192);
......
...@@ -46,6 +46,8 @@ ...@@ -46,6 +46,8 @@
#ifndef ADDEMPTYWIDGET_HH #ifndef ADDEMPTYWIDGET_HH
#define ADDEMPTYWIDGET_HH #define ADDEMPTYWIDGET_HH
#include <OpenFlipper/common/Types.hh>
#include "ui_addEmpty.hh" #include "ui_addEmpty.hh"
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
...@@ -55,7 +57,7 @@ ...@@ -55,7 +57,7 @@
#endif #endif
#include "OpenFlipper/common/Types.hh"
class addEmptyWidget : public QDialog, public Ui::addEmpty class addEmptyWidget : public QDialog, public Ui::addEmpty
{ {
......
...@@ -8,11 +8,13 @@ ...@@ -8,11 +8,13 @@
#ifndef FILEPICKER_HH_ #ifndef FILEPICKER_HH_
#define FILEPICKER_HH_ #define FILEPICKER_HH_
#include <OpenFlipper/common/RecentFiles.hh>
#include <QWidget> #include <QWidget>
#include <QComboBox> #include <QComboBox>
#include <QLineEdit> #include <QLineEdit>
#include <QPushButton> #include <QPushButton>
#include <OpenFlipper/common/RecentFiles.hh>
class DLLEXPORT FilePicker : public QWidget { class DLLEXPORT FilePicker : public QWidget {
Q_OBJECT Q_OBJECT
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
...@@ -48,9 +50,6 @@ ...@@ -48,9 +50,6 @@
#endif #endif
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
class FileOptionsDialog : public QDialog class FileOptionsDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
......
...@@ -40,6 +40,8 @@ ...@@ -40,6 +40,8 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
...@@ -49,8 +51,6 @@ ...@@ -49,8 +51,6 @@
#include <QDirModel> #include <QDirModel>
#include <OpenFlipper/common/Types.hh>
#include <OpenFlipper/Core/Core.hh>
#include <map> #include <map>
class LoadWidget : public QFileDialog class LoadWidget : public QFileDialog
......
...@@ -40,12 +40,12 @@ ...@@ -40,12 +40,12 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include "optionsWidget.hh" #include "optionsWidget.hh"
#include <OpenFlipper/common/GlobalOptions.hh> #include <OpenFlipper/common/GlobalOptions.hh>
#include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include "ShortcutButton.hh" #include "ShortcutButton.hh"
#include <QMessageBox> #include <QMessageBox>
......
...@@ -42,16 +42,16 @@ ...@@ -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/ACGHelper/DrawModeConverter.hh>
#include <OpenFlipper/INIFile/INIFile.hh> #include <OpenFlipper/INIFile/INIFile.hh>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh> #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include <ACG/GL/ShaderCache.hh> #include <ACG/GL/ShaderCache.hh>
#include "optionsWidget.hh"
#include <iostream>
#include <QColorDialog> #include <QColorDialog>
#include <QMessageBox> #include <QMessageBox>
......
...@@ -46,6 +46,9 @@ ...@@ -46,6 +46,9 @@
#ifndef OPTIONSWIDGET_HH #ifndef OPTIONSWIDGET_HH
#define OPTIONSWIDGET_HH #define OPTIONSWIDGET_HH
#include <OpenFlipper/Core/PluginInfo.hh>
#include <ACG/Scenegraph/DrawModes.hh>
#include "ui_optionsWidget.hh" #include "ui_optionsWidget.hh"
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
...@@ -58,8 +61,6 @@ ...@@ -58,8 +61,6 @@
#include <QProgressDialog> #include <QProgressDialog>
#include <QtNetwork> #include <QtNetwork>
#include <OpenFlipper/Core/PluginInfo.hh>
#include <ACG/Scenegraph/DrawModes.hh>
//map for keyBindings //map for keyBindings
typedef std::multimap< std::pair< QObject*, int >, std::pair< int, Qt::KeyboardModifiers > > InverseKeyMap; typedef std::multimap< std::pair< QObject*, int >, std::pair< int, Qt::KeyboardModifiers > > InverseKeyMap;
......
...@@ -34,12 +34,16 @@ ...@@ -34,12 +34,16 @@
/*===========================================================================*\ /*===========================================================================*\
* * * *
* $Revision: 15910 $ * * $Revision$ *
* $LastChangedBy: moeller $ * * $LastChangedBy$ *
* $Date: 2012-12-05 12:53:39 +0100 (Mi, 05 Dez 2012) $ * * $Date$ *
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/RendererInfo.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else #else
...@@ -50,10 +54,6 @@ ...@@ -50,10 +54,6 @@
#include <functional> #include <functional>
#include <algorithm> #include <algorithm>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/RendererInfo.hh>
#include <OpenFlipper/common/GlobalOptions.hh>
#include <QMenu> #include <QMenu>
......
...@@ -40,14 +40,13 @@ ...@@ -40,14 +40,13 @@
* * * *
\*===========================================================================*/ \*===========================================================================*/
#include "BackupPlugin.hh"
#if QT_VERSION >= 0x050000 #if QT_VERSION >= 0x050000
#include <QtWidgets> #include <QtWidgets>
#else #else
#include <QtGui> #include <QtGui>
#endif #endif
#include "BackupPlugin.hh"
#include <iostream> #include <iostream>
#include <OpenFlipper/BasePlugin/PluginFunctions.hh> #include <OpenFlipper/BasePlugin/PluginFunctions.hh>
#include <OpenFlipper/common/GlobalOptions.hh> #include <OpenFlipper/common/GlobalOptions.hh>
......
...@@ -43,9 +43,6 @@ ...@@ -43,9 +43,6 @@
#ifndef BACKUPPLUGIN_HH #ifndef BACKUPPLUGIN_HH
#define BACKUPPLUGIN_HH #define BACKUPPLUGIN_HH
#include <QObject>
#include <QMenuBar>
#include <OpenFlipper/BasePlugin/BaseInterface.hh> #include <OpenFlipper/BasePlugin/BaseInterface.hh>
#include <OpenFlipper/BasePlugin/KeyInterface.hh> #include <OpenFlipper/BasePlugin/KeyInterface.hh>
#include <OpenFlipper/BasePlugin/LoggingInterface.hh> #include <OpenFlipper/BasePlugin/LoggingInterface.hh>
...@@ -56,6 +53,9 @@ ...@@ -56,6 +53,9 @@
#include <OpenFlipper/BasePlugin/ContextMenuInterface.hh> #include <OpenFlipper/BasePlugin/ContextMenuInterface.hh>
#include <OpenFlipper/common/Types.hh> #include <OpenFlipper/common/Types.hh>
#include <QObject>
#include <QMenuBar>
#include "GroupData.hh" #include "GroupData.hh"
class BackupPlugin : public QObject, BaseInterface , KeyInterface, MenuInterface, BackupInterface, LoggingInterface, ToolbarInterface, LoadSaveInterface, ContextMenuInterface class BackupPlugin : public QObject, BaseInterface , KeyInterface, MenuInterface, BackupInterface, LoggingInterface, ToolbarInterface, LoadSaveInterface, ContextMenuInterface
......
...@@ -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>
......
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