From 238448d13ba6bb9fc02815b8934d8d11eb2e854d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20M=C3=B6ller?= Date: Fri, 27 Jun 2014 12:18:12 +0000 Subject: [PATCH] - 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 --- TextureControl.cc | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/TextureControl.cc b/TextureControl.cc index 15c8b51..2d9a209 100644 --- a/TextureControl.cc +++ b/TextureControl.cc @@ -41,25 +41,24 @@ \*===========================================================================*/ -#if QT_VERSION >= 0x050000 - #include -#else - #include -#endif - - #include "TextureControl.hh" #include #include -#include "OpenFlipper/BasePlugin/PluginFunctions.hh" -#include "OpenFlipper/BasePlugin/PluginFunctionsViewControls.hh" -#include "OpenFlipper/common/GlobalOptions.hh" +#include +#include +#include #include "ImageStorage.hh" +#if QT_VERSION >= 0x050000 +#include +#else +#include +#endif + #ifdef ENABLE_OPENVOLUMEMESH_SUPPORT -#include "ObjectTypes/VolumeMeshObject/VolumeMeshDrawModesContainer.hh" +#include #endif #define TEXTUREDATA "TextureData" -- GitLab