Commit b453d8eb authored by Jan Möbius's avatar Jan Möbius

I hate Macros checkin ...

Change Pluginlib for windows to export and import symbols correctly.

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@4498 383ad7c9-94d9-4d36-a494-682f7c89f535
parent b0ea3ff5
......@@ -45,17 +45,10 @@
#include <ACG/Scenegraph/DrawModes.hh>
#include <QString>
#include <OpenFlipper/common/GlobalDefines.hh>
//== DEFINES =================================================================
#ifndef DLLEXPORT
#ifdef WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#endif
//== TYPEDEFS =================================================================
......
......@@ -35,14 +35,7 @@
#ifndef TOOLS_INIFILE_HH
#define TOOLS_INIFILE_HH
#ifndef DLLEXPORT
#ifdef WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#endif
#include <OpenFlipper/common/GlobalDefines.hh>
#include <QString>
#include <QFile>
#include <map>
......
......@@ -16,6 +16,7 @@ DIRECTORIES = ../BasePlugin ../ACGHelper ../common ../common/bsp ../INIFile $$f
../widgets/glWidget
win32 {
DESTDIR = ../$${BUILDDIRECTORY}
DEFINES += PLUGINLIBDLL
}
......
......@@ -47,17 +47,9 @@
#ifndef BASEOBJECT_HH
#define BASEOBJECT_HH
#ifndef DLLEXPORT
#ifdef WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#endif
//== INCLUDES =================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
#include <QString>
#include <QList>
#include <QStringList>
......@@ -74,7 +66,7 @@
* This is the basic Data class providing the functions common to all objects.
* If the Datacontrol Plugin is available, a Tree structure will be generated allowing groups of objects.
*/
class DLLEXPORT BaseObject {
class DLLEXPORTONLY BaseObject {
friend class BaseObjectData;
public :
......
......@@ -49,16 +49,9 @@
#define BASEOBJECTDATA_HH
#ifndef DLLEXPORT
#ifdef WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#endif
//== INCLUDES =================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
#include "BaseObject.hh"
#include <vector>
#include <ACG/Scenegraph/MaterialNode.hh>
......
......@@ -58,14 +58,25 @@
*/
#define USE_OPENMP
#ifdef WIN32
#ifndef DLLEXPORT
#define DLLEXPORT __declspec(dllexport)
#endif
#else
#ifndef DLLEXPORT
#define DLLEXPORT
#endif
#ifdef WIN32
#ifdef PLUGINLIBDLL
#ifdef USEPLUGINLIBDLL
#define DLLEXPORT __declspec(dllimport)
#define DLLEXPORTONLY
#else
#define DLLEXPORT __declspec(dllexport)
#define DLLEXPORTONLY __declspec(dllexport)
#endif
#else
#define DLLEXPORT
#define DLLEXPORTONLY
#endif
#else
#define DLLEXPORT
#define DLLEXPORTONLY
#endif
#endif
......
......@@ -47,14 +47,7 @@
#ifndef OPTIONS_HH
#define OPTIONS_HH
#ifndef DLLEXPORT
#ifdef WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#endif
#include <OpenFlipper/common/GlobalDefines.hh>
#include <QDir>
#include <QStringList>
#include <QColor>
......
......@@ -48,16 +48,9 @@
#define GROUPOBJECT_HH
#ifndef DLLEXPORT
#ifdef WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#endif
//== INCLUDES =================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
#include <QList>
//== TYPEDEFS =================================================================
......
......@@ -47,12 +47,6 @@
#ifndef RECENTFILES_HH
#define RECENTFILES_HH
#ifdef WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#include <QDir>
#include <QStringList>
......
......@@ -47,7 +47,7 @@
#ifndef TYPES_HH
#define TYPES_HH
#include "GlobalDefines.hh"
#include <OpenFlipper/common/GlobalDefines.hh>
#include <limits.h>
#include <QIcon>
......
......@@ -47,16 +47,11 @@
#ifndef PEROBJECTDATA_HH
#define PEROBJECTDATA_HH
#ifndef DLLEXPORT
#ifdef WIN32
#define DLLEXPORT __declspec(dllexport)
#else
#define DLLEXPORT
#endif
#endif
//== INCLUDES =================================================================
#include <OpenFlipper/common/GlobalDefines.hh>
//== TYPEDEFS =================================================================
......
......@@ -442,6 +442,7 @@ void CoreWidget::coreKeyPressEvent (QKeyEvent* _e){
case Qt::Key_Space:
if ( OpenFlipper::Options::multiView() ) {
emit log( "Switch to MultiView");
if ( examiner_widgets_[1]->isHidden() ) {
for ( uint i = 1 ; i < OpenFlipper::Options::examinerWidgets() ; ++i )
......
......@@ -38,8 +38,8 @@
//
//=============================================================================
#ifndef ACG_QTBASEVIEWER_HH
#define ACG_QTBASEVIEWER_HH
#ifndef BASEVIEWER_HH
#define BASEVIEWER_HH
//== INCLUDES =================================================================
......@@ -95,7 +95,6 @@ namespace ACG {
}
class QtGLGraphicsScene;
class QtGLGraphicsView;
class QtSceneGraphDialog;
class QtShiftPopupMenu;
......@@ -1086,5 +1085,5 @@ private:
//=============================================================================
//=============================================================================
#endif // ACG_QTBASEVIEWER_HH defined
#endif // BASEVIEWER_HH defined
//=============================================================================
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