Coupure prévue mardi 3 Août au matin pour maintenance du serveur. Nous faisons au mieux pour que celle-ci soit la plus brève possible.

Commit a6fafab3 authored by Pierre Kraemer's avatar Pierre Kraemer
Browse files

Merge branch 'develop' into 'develop'

LSM plugin + plugin dll export symbols



See merge request !87
parents aa81c0e3 b27412a1
#ifndef _SURFACE_RENDERVECTOR_PLUGIN_H_
#define _SURFACE_RENDERVECTOR_PLUGIN_H_
#include "dll.h"
#include "plugin_interaction.h"
#include "surface_renderVector_dockTab.h"
......@@ -30,7 +31,7 @@ struct MapParameters
* The length and color of each vector can be changed.
* All parameters are per view / per map.
*/
class Surface_RenderVector_Plugin : public PluginInteraction
class SURFACE_RENDER_VECTOR_API Surface_RenderVector_Plugin : public PluginInteraction
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Selection )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_selection )
ADD_DEFINITIONS(-DSURFACE_SELECTION_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined SURFACE_SELECTION_DLL_EXPORT
#define SURFACE_SELECTION_API __declspec(dllexport)
#else
#define SURFACE_SELECTION_API __declspec(dllimport)
#endif
#else
#define SURFACE_SELECTION_API
#endif
#ifndef _SURFACE_SELECTION_PLUGIN_H_
#define _SURFACE_SELECTION_PLUGIN_H_
#include "dll.h"
#include "plugin_interaction.h"
#include "surface_selection_dockTab.h"
......@@ -42,7 +43,7 @@ struct MapParameters
* - in a sphere
* - with a give variation of the normal.
*/
class Surface_Selection_Plugin : public PluginInteraction
class SURFACE_SELECTION_API Surface_Selection_Plugin : public PluginInteraction
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Surface_Subdivision )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/surface_subdivision )
ADD_DEFINITIONS(-DSURFACE_SUBDIVISION_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined SURFACE_SUBDIVISION_DLL_EXPORT
#define SURFACE_SUBDIVISION_API __declspec(dllexport)
#else
#define SURFACE_SUBDIVISION_API __declspec(dllimport)
#endif
#else
#define SURFACE_SUBDIVISION_API
#endif
#ifndef _SURFACE_SUBDIVISION_PLUGIN_H_
#define _SURFACE_SUBDIVISION_PLUGIN_H_
#include "dll.h"
#include "plugin_processing.h"
#include "dialog_surface_subdivision.h"
......@@ -20,7 +21,7 @@ namespace SCHNApps
* - linear triangulation
* - linear quadrangulation
*/
class Surface_Subdivision_Plugin : public Plugin
class SURFACE_SUBDIVISION_API Surface_Subdivision_Plugin : public Plugin
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Volume_Import )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/volume_import )
ADD_DEFINITIONS(-DVOLUME_IMPORT_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined VOLUME_IMPORT_DLL_EXPORT
#define VOLUME_IMPORT_API __declspec(dllexport)
#else
#define VOLUME_IMPORT_API __declspec(dllimport)
#endif
#else
#define VOLUME_IMPORT_API
#endif
#ifndef _VOLUME_IMPORT_PLUGIN_H_
#define _VOLUME_IMPORT_PLUGIN_H_
#include "dll.h"
#include "plugin_processing.h"
namespace CGoGN
......@@ -9,7 +10,7 @@ namespace CGoGN
namespace SCHNApps
{
class Volume_Import_Plugin : public PluginProcessing
class VOLUME_IMPORT_API Volume_Import_Plugin : public PluginProcessing
{
Q_OBJECT
Q_INTERFACES(CGoGN::SCHNApps::Plugin)
......
......@@ -4,6 +4,8 @@ SET( PLUGIN_NAME Volume_Render )
SET( PLUGIN_ROOT_DIR ${SCHNApps_ROOT_DIR}/Plugins/volume_render )
ADD_DEFINITIONS(-DVOLUME_RENDER_DLL_EXPORT)
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
......
#ifdef WIN32
#if defined VOLUME_RENDER_DLL_EXPORT
#define VOLUME_RENDER_API __declspec(dllexport)
#else
#define VOLUME_RENDER_API __declspec(dllimport)
#endif
#else
#define VOLUME_RENDER_API
#endif
......@@ -129,6 +129,8 @@ class Matrix
{
public:
static std::string CGoGNnameOfType() { return ""; }
/** \brief Base class typedef.
* \sa PlainObjectBase
*/
......
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