Commit 01480434 authored by Thery Sylvain's avatar Thery Sylvain Committed by Sylvain Thery

back to mac osX

parent 236ada28
...@@ -41,6 +41,8 @@ ...@@ -41,6 +41,8 @@
#define CGoGN_ALGO_API __declspec(dllimport) #define CGoGN_ALGO_API __declspec(dllimport)
#endif #endif
#endif #endif
#else
#define CGoGN_ALGO_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#define CGoGN_ALGO_API __declspec(dllimport) #define CGoGN_ALGO_API __declspec(dllimport)
#endif #endif
#endif #endif
#else
#define CGoGN_ALGO_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#define CGoGN_ALGO_API __declspec(dllimport) #define CGoGN_ALGO_API __declspec(dllimport)
#endif #endif
#endif #endif
#else
#define CGoGN_ALGO_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -35,6 +35,8 @@ ...@@ -35,6 +35,8 @@
#define CGoGN_ALGO_API __declspec(dllimport) #define CGoGN_ALGO_API __declspec(dllimport)
#endif #endif
#endif #endif
#else
#define CGoGN_ALGO_API
#endif #endif
......
...@@ -50,6 +50,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } } ...@@ -50,6 +50,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#define CGoGN_ALGO_API __declspec(dllimport) #define CGoGN_ALGO_API __declspec(dllimport)
#endif #endif
#endif #endif
#else
#define CGoGN_ALGO_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -47,6 +47,8 @@ ...@@ -47,6 +47,8 @@
#define CGoGN_ALGO_API __declspec(dllimport) #define CGoGN_ALGO_API __declspec(dllimport)
#endif #endif
#endif #endif
#else
#define CGoGN_ALGO_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -38,6 +38,8 @@ ...@@ -38,6 +38,8 @@
#else #else
#define CGoGN_CONTAINER_API __declspec(dllimport) #define CGoGN_CONTAINER_API __declspec(dllimport)
#endif #endif
#else
#define CGoGN_CONTAINER_API
#endif #endif
namespace CGoGN namespace CGoGN
...@@ -1050,4 +1052,4 @@ public: ...@@ -1050,4 +1052,4 @@ public:
// CGoGN_XX_API void dumpByLines() const; // CGoGN_XX_API void dumpByLines() const;
// //
// //
//}; //};
\ No newline at end of file
...@@ -94,7 +94,7 @@ typename VEC::DATA_TYPE angle(const VEC& a, const VEC& b) ...@@ -94,7 +94,7 @@ typename VEC::DATA_TYPE angle(const VEC& a, const VEC& b)
template <typename VEC3> template <typename VEC3>
typename VEC3::DATA_TYPE triangleArea(const VEC3& p1, const VEC3& p2, const VEC3& p3) typename VEC3::DATA_TYPE triangleArea(const VEC3& p1, const VEC3& p2, const VEC3& p3)
{ {
return VEC3::DATA_TYPE(0.5 * ((p2 - p1) ^ (p3 - p1)).norm()); return typename VEC3::DATA_TYPE (0.5 * ((p2 - p1) ^ (p3 - p1)).norm());
} }
// normal of the plane spanned by 3 points in 3D // normal of the plane spanned by 3 points in 3D
......
...@@ -273,7 +273,7 @@ inline Vector<DIM, T> Vector<DIM, T>::operator/(T2 a) const ...@@ -273,7 +273,7 @@ inline Vector<DIM, T> Vector<DIM, T>::operator/(T2 a) const
Vector<DIM, T> res ; Vector<DIM, T> res ;
T aa = T(a); T aa = T(a);
for (unsigned int i = 0; i < DIM; ++i) for (unsigned int i = 0; i < DIM; ++i)
res[i] = m_data[i] / T(a) ; res[i] = m_data[i] / aa ;
return res ; return res ;
} }
......
...@@ -31,4 +31,6 @@ ...@@ -31,4 +31,6 @@
#define CGoGN_TOPO_API __declspec(dllimport) #define CGoGN_TOPO_API __declspec(dllimport)
#endif #endif
#endif #endif
#endif #else
\ No newline at end of file #define CGoGN_TOPO_API
#endif
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
*******************************************************************************/ *******************************************************************************/
#include "Utils/threadbarrier.h" #include "Utils/threadbarrier.h"
#include "Algo/Topo/embedding.h"
#include <vector> #include <vector>
...@@ -196,7 +198,6 @@ inline T& AttributeHandler<T, ORB, MAP>::operator[](Cell<ORB> c) ...@@ -196,7 +198,6 @@ inline T& AttributeHandler<T, ORB, MAP>::operator[](Cell<ORB> c)
if (a == EMBNULL) if (a == EMBNULL)
a = Algo::Topo::setOrbitEmbeddingOnNewCell(*m_map, c) ; a = Algo::Topo::setOrbitEmbeddingOnNewCell(*m_map, c) ;
return m_attrib->operator[](a) ; return m_attrib->operator[](a) ;
} }
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
* * * *
*******************************************************************************/ *******************************************************************************/
#include "Topology/generic/traversor/traversorFactory.h"
namespace CGoGN namespace CGoGN
{ {
......
...@@ -25,6 +25,12 @@ ...@@ -25,6 +25,12 @@
#ifndef __TRAVERSORFACTORY_H__ #ifndef __TRAVERSORFACTORY_H__
#define __TRAVERSORFACTORY_H__ #define __TRAVERSORFACTORY_H__
#include "Topology/generic/traversor/traversor1Virt.h"
#include "Topology/generic/traversor/traversor2Virt.h"
#include "Topology/generic/traversor/traversor3Virt.h"
#include "Topology/generic/traversor/traversorCellVirt.h"
#include "Topology/generic/traversor/traversorDoO.h"
namespace CGoGN namespace CGoGN
{ {
......
...@@ -22,12 +22,6 @@ ...@@ -22,12 +22,6 @@
* * * *
*******************************************************************************/ *******************************************************************************/
#include "Topology/generic/traversor/traversor1Virt.h"
#include "Topology/generic/traversor/traversor2Virt.h"
#include "Topology/generic/traversor/traversor3Virt.h"
#include "Topology/generic/traversor/traversorCellVirt.h"
#include "Topology/generic/traversor/traversorDoO.h"
namespace CGoGN namespace CGoGN
{ {
......
...@@ -857,7 +857,7 @@ bool GMap3<MAP_IMPL>::isBoundaryAdjacentVolume(Dart d) const ...@@ -857,7 +857,7 @@ bool GMap3<MAP_IMPL>::isBoundaryAdjacentVolume(Dart d) const
for(unsigned int i = 0; i < visitedFaces.size(); ++i) for(unsigned int i = 0; i < visitedFaces.size(); ++i)
{ {
if (isBoundaryMarked<3>(beta3(visitedFaces[i]))) if (this->isBoundaryMarked<3>(beta3(visitedFaces[i])))
return true ; return true ;
Dart e = visitedFaces[i] ; Dart e = visitedFaces[i] ;
......
...@@ -46,6 +46,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } } ...@@ -46,6 +46,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#else #else
#define CGoGN_UTILS_API __declspec(dllimport) #define CGoGN_UTILS_API __declspec(dllimport)
#endif #endif
#else
#define CGoGN_UTILS_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -46,6 +46,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } } ...@@ -46,6 +46,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#else #else
#define CGoGN_UTILS_API __declspec(dllimport) #define CGoGN_UTILS_API __declspec(dllimport)
#endif #endif
#else
#define CGoGN_UTILS_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -47,6 +47,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } } ...@@ -47,6 +47,8 @@ namespace CGoGN { namespace Utils { class GLSLShader; } }
#define CGoGN_UTILS_API __declspec(dllimport) #define CGoGN_UTILS_API __declspec(dllimport)
#endif #endif
#endif #endif
#else
#define CGoGN_UTILS_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -39,6 +39,8 @@ ...@@ -39,6 +39,8 @@
#else #else
#define CGoGN_UTILS_API __declspec(dllimport) #define CGoGN_UTILS_API __declspec(dllimport)
#endif #endif
#else
#define CGoGN_UTILS_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -43,6 +43,8 @@ ...@@ -43,6 +43,8 @@
#else #else
#define CGoGN_UTILS_API __declspec(dllimport) #define CGoGN_UTILS_API __declspec(dllimport)
#endif #endif
#else
#define CGoGN_UTILS_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -37,6 +37,8 @@ ...@@ -37,6 +37,8 @@
#define CGoGN_UTILS_API __declspec(dllimport) #define CGoGN_UTILS_API __declspec(dllimport)
#endif #endif
#endif #endif
#else
#define CGoGN_UTILS_API
#endif #endif
namespace CGoGN namespace CGoGN
......
...@@ -31,4 +31,6 @@ ...@@ -31,4 +31,6 @@
#define CGoGN_UTILS_API __declspec(dllimport) #define CGoGN_UTILS_API __declspec(dllimport)
#endif #endif
#endif #endif
#endif #else
\ No newline at end of file #define CGoGN_UTILS_API
#endif
...@@ -39,7 +39,7 @@ namespace Utils ...@@ -39,7 +39,7 @@ namespace Utils
namespace SVG namespace SVG
{ {
#define uint32 unsigned int typedef unsigned int uint32;
const std::vector<Geom::Vec3f>& SvgObj::vertices() const const std::vector<Geom::Vec3f>& SvgObj::vertices() const
{ {
......
...@@ -95,9 +95,10 @@ endif() ...@@ -95,9 +95,10 @@ endif()
if(WIN32) if(WIN32)
LIST(APPEND CMAKE_CXX_FLAGS "/W3") LIST(APPEND CMAKE_CXX_FLAGS "/W3")
else() else()
LIST(APPEND CMAKE_CXX_FLAGS "-Wall -fPIC -std=c++11")
if(APPLE) if(APPLE)
LIST(APPEND CMAKE_CXX_FLAGS "-Wno-deprecated -Wno-overloaded-virtual") LIST(APPEND CMAKE_CXX_FLAGS "-Wall -fPIC -std=c++11 -Wno-deprecated -Wno-overloaded-virtual")
else()
LIST(APPEND CMAKE_CXX_FLAGS "-Wall -fPIC -std=c++11")
endif() endif()
endif() endif()
......
...@@ -80,46 +80,3 @@ TARGET_LINK_LIBRARIES( SCHNAppsLib ...@@ -80,46 +80,3 @@ TARGET_LINK_LIBRARIES( SCHNAppsLib
${CGoGN_LIBS} ${CGoGN_LIBS}
${EXT_LIBS} ${EXT_LIBS}
) )
INCLUDE_DIRECTORIES(
${PLUGIN_ROOT_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
)
file(
GLOB_RECURSE
PLUGIN_FILES
${PLUGIN_ROOT_DIR}/src/*.cpp
${PLUGIN_ROOT_DIR}/include/*.h
${PLUGIN_ROOT_DIR}/include/*.hpp
)
file(
GLOB_RECURSE
PLUGIN_UI_FILES
${PLUGIN_ROOT_DIR}/forms/*.ui
)
SET(
PLUGIN_QOBJECT_FILES
${PLUGIN_ROOT_DIR}/include/surface_selection.h
${PLUGIN_ROOT_DIR}/include/surface_selection_dockTab.h
)
include( ${SCHNApps_ROOT_DIR}/Plugins/plugins_cmake.txt )
...@@ -6,13 +6,7 @@ ...@@ -6,13 +6,7 @@
#include <QGLViewer/manipulatedCameraFrame.h> #include <QGLViewer/manipulatedCameraFrame.h>
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace CGoGN namespace CGoGN
{ {
......
...@@ -8,17 +8,11 @@ ...@@ -8,17 +8,11 @@
#include "Topology/generic/dart.h" #include "Topology/generic/dart.h"
#include "Topology/generic/genericmap.h" #include "Topology/generic/genericmap.h"
#include "Topology/generic/cellmarker.h" #include "Topology/generic/cellmarker.h"
#include "Topology/generic/traversor/traversorCell.h"
#include "slot_debug.h" #include "slot_debug.h"
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace CGoGN namespace CGoGN
{ {
......
...@@ -3,14 +3,7 @@ ...@@ -3,14 +3,7 @@
#include <QComboBox> #include <QComboBox>
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
class QColor; class QColor;
class QWidget; class QWidget;
......
...@@ -3,13 +3,7 @@ ...@@ -3,13 +3,7 @@
#include "ui_controlDock_CameraTabWidget.h" #include "ui_controlDock_CameraTabWidget.h"
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace CGoGN namespace CGoGN
{ {
......
...@@ -6,14 +6,7 @@ ...@@ -6,14 +6,7 @@
#include "mapHandler.h" #include "mapHandler.h"
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace CGoGN namespace CGoGN
{ {
......
...@@ -3,14 +3,7 @@ ...@@ -3,14 +3,7 @@
#include "ui_controlDock_PluginTabWidget.h" #include "ui_controlDock_PluginTabWidget.h"
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace CGoGN namespace CGoGN
{ {
......
...@@ -7,13 +7,7 @@ ...@@ -7,13 +7,7 @@
#include <QListWidget> #include <QListWidget>
#include <QListWidgetItem> #include <QListWidgetItem>
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace CGoGN namespace CGoGN
{ {
......
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#else
#define SCHNAPPS_API
#endif
...@@ -22,13 +22,7 @@ ...@@ -22,13 +22,7 @@
#include "Utils/vbo.h" #include "Utils/vbo.h"
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace CGoGN namespace CGoGN
{ {
......
...@@ -8,14 +8,7 @@ ...@@ -8,14 +8,7 @@
#include "types.h" #include "types.h"
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace CGoGN namespace CGoGN
{ {
......
...@@ -19,8 +19,8 @@ class SCHNAPPS_API PluginInteraction : public Plugin ...@@ -19,8 +19,8 @@ class SCHNAPPS_API PluginInteraction : public Plugin
friend class View; friend class View;
public: public:
inline PluginInteraction(); PluginInteraction();
inline virtual ~PluginInteraction(); virtual ~PluginInteraction();
public slots: public slots:
inline const QList<View*>& getLinkedViews() const { return l_views; } inline const QList<View*>& getLinkedViews() const { return l_views; }
...@@ -47,16 +47,16 @@ private: ...@@ -47,16 +47,16 @@ private:
* MANAGE LINKED VIEWS * MANAGE LINKED VIEWS
*********************************************************/ *********************************************************/
inline void linkView(View* view); void linkView(View* view);
inline void unlinkView(View* view); void unlinkView(View* view);
/********************************************************* /*********************************************************
* MANAGE SHADERS * MANAGE SHADERS
*********************************************************/ *********************************************************/
protected: protected:
inline void registerShader(Utils::GLSLShader* shader); void registerShader(Utils::GLSLShader* shader);
inline void unregisterShader(Utils::GLSLShader* shader); void unregisterShader(Utils::GLSLShader* shader);
protected: protected:
QList<View*> l_views; QList<View*> l_views;
......
...@@ -2,13 +2,7 @@ ...@@ -2,13 +2,7 @@
#define _SCHNAPPS_H_ #define _SCHNAPPS_H_
#ifdef WIN32 #include "dll.h"
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
#include "ui_schnapps.h" #include "ui_schnapps.h"
......
...@@ -4,13 +4,7 @@ ...@@ -4,13 +4,7 @@