Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
1011a584
Commit
1011a584
authored
Feb 26, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
SCHNApps is on Windows
parent
e64321f1
Changes
23
Hide whitespace changes
Inline
Side-by-side
Showing
23 changed files
with
345 additions
and
129 deletions
+345
-129
CMakeLists.txt
CMakeLists.txt
+29
-33
SCHNApps/CMakeLists.txt
SCHNApps/CMakeLists.txt
+43
-62
SCHNApps/Plugins/CMakeLists.txt
SCHNApps/Plugins/CMakeLists.txt
+1
-1
SCHNApps/Plugins/plugins_cmake.txt
SCHNApps/Plugins/plugins_cmake.txt
+2
-1
SCHNApps/Plugins/schnapps/CMakeLists.txt
SCHNApps/Plugins/schnapps/CMakeLists.txt
+124
-0
SCHNApps/include/camera.h
SCHNApps/include/camera.h
+10
-1
SCHNApps/include/cellSelector.h
SCHNApps/include/cellSelector.h
+10
-1
SCHNApps/include/colorComboBox.h
SCHNApps/include/colorComboBox.h
+10
-1
SCHNApps/include/controlDock_cameraTab.h
SCHNApps/include/controlDock_cameraTab.h
+9
-1
SCHNApps/include/controlDock_mapTab.h
SCHNApps/include/controlDock_mapTab.h
+11
-1
SCHNApps/include/controlDock_pluginTab.h
SCHNApps/include/controlDock_pluginTab.h
+10
-1
SCHNApps/include/dialogList.h
SCHNApps/include/dialogList.h
+8
-1
SCHNApps/include/mapHandler.h
SCHNApps/include/mapHandler.h
+9
-1
SCHNApps/include/plugin.h
SCHNApps/include/plugin.h
+12
-1
SCHNApps/include/plugin_interaction.h
SCHNApps/include/plugin_interaction.h
+12
-10
SCHNApps/include/plugin_processing.h
SCHNApps/include/plugin_processing.h
+4
-3
SCHNApps/include/schnapps.h
SCHNApps/include/schnapps.h
+13
-1
SCHNApps/include/slot_debug.h
SCHNApps/include/slot_debug.h
+10
-1
SCHNApps/include/view.h
SCHNApps/include/view.h
+11
-1
SCHNApps/src/camera.cpp
SCHNApps/src/camera.cpp
+2
-0
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+2
-2
SCHNApps/src/slot_debug.cpp
SCHNApps/src/slot_debug.cpp
+2
-4
SCHNApps/src/view.cpp
SCHNApps/src/view.cpp
+1
-1
No files found.
CMakeLists.txt
View file @
1011a584
...
...
@@ -43,10 +43,10 @@ setBuildType()
SET
(
EXECUTABLE_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
)
IF
(
WIN32
)
IF
(
NOT CGoGN_WITH_QTCREATOR
)
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
)
ELSE
()
IF
(
CGoGN_WITH_QTCREATOR
)
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
ELSE
()
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
)
ENDIF
()
ELSE
()
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
...
...
@@ -134,7 +134,7 @@ IF(NOT WIN32)
set
(
CMAKE_CXX_FLAGS
"
${
CMAKE_CXX_FLAGS
}
-Wno-deprecated -Wno-overloaded-virtual"
)
ENDIF
()
ELSE
()
ADD_DEFINITIONS
(
"/wd4251"
)
ADD_DEFINITIONS
(
"/wd4251"
)
#dll export warnings
ENDIF
()
...
...
@@ -185,14 +185,10 @@ SET (CGoGN_EXT_INCLUDES)
SET
(
CGoGN_EXT_LIBS
)
IF
(
CGoGN_WITH_QT
)
INCLUDE
(
${
QT_USE_FILE
}
)
# ADD_DEFINITIONS(-DCGOGN_WITH_QT)
# ADD_DEFINITIONS(${QT_DEFINITIONS})
LIST
(
APPEND CGoGN_DEFS -DCGOGN_WITH_QT
)
LIST
(
APPEND CGoGN_EXT_INCLUDES
${
QT_INCLUDE_DIR
}
)
LIST
(
APPEND CGoGN_EXT_LIBS QGLViewer
${
QT_LIBRARIES
}
)
# IF (NOT WIN32)
LIST
(
APPEND CGoGN_EXT_INCLUDES
${
CGoGN_ROOT_DIR
}
/ThirdParty/libQGLViewer/
)
# ENDIF()
LIST
(
APPEND CGoGN_EXT_INCLUDES
${
CGoGN_ROOT_DIR
}
/ThirdParty/libQGLViewer/
)
ELSE
()
LIST
(
APPEND CGoGN_EXT_INCLUDES
${
IL_INCLUDE_DIR
}
)
LIST
(
APPEND CGoGN_EXT_LIBS
${
IL_LIBRARIES
}
)
...
...
@@ -294,30 +290,30 @@ add_subdirectory(${CGoGN_ROOT_DIR}/Apps Apps)
# Add custom clean targets for cleaning without cleaning dependencies
#
if
(
WIN32
)
add_custom_target
(
clean_cgogn
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET clean_cgogn PRE_BUILD
COMMAND del /q CCoGN
COMMAND cmake ..
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
COMMENT
"cleaning CGoGN libs"
)
add_custom_target
(
clean_apps
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET clean_apps PRE_BUILD
COMMAND del /q Apps
COMMAND cmake ..
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
COMMENT
"cleaning Apps"
)
add_custom_target
(
clean_cgogn_apps
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
)
add_custom_command
(
TARGET clean_cgogn_apps PRE_BUILD
COMMAND del /q CGoGN
COMMAND del /q Apps
COMMAND cmake ..
WORKING_DIRECTORY
${
CMAKE_CURRENT_BINARY_DIR
}
COMMENT
"cleaning Apps"
)
#
add_custom_target(clean_cgogn
#
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
#
add_custom_command(TARGET clean_cgogn PRE_BUILD
#
COMMAND del /q CCoGN
#
COMMAND cmake ..
#
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
#
COMMENT "cleaning CGoGN libs")
#
#
add_custom_target(clean_apps
#
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
#
add_custom_command(TARGET clean_apps PRE_BUILD
#
COMMAND del /q Apps
#
COMMAND cmake ..
#
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
#
COMMENT "cleaning Apps")
#
#
add_custom_target(clean_cgogn_apps
#
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
#
add_custom_command(TARGET clean_cgogn_apps PRE_BUILD
#
COMMAND del /q CGoGN
#
COMMAND del /q Apps
#
COMMAND cmake ..
#
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
#
COMMENT "cleaning Apps")
ELSE
()
...
...
SCHNApps/CMakeLists.txt
View file @
1011a584
...
...
@@ -7,6 +7,10 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fPIC -std=c++11")
SET
(
CGoGN_SLOT_DEBUG_MODE OFF CACHE BOOL
"build with slot debugging mode"
)
SET
(
CGoGN_ROOT_DIR
${
CMAKE_SOURCE_DIR
}
/.. CACHE STRING
"CGoGN root dir"
)
IF
(
WIN32
)
SET
(
CMAKE_PREFIX_PATH
${
CGoGN_ROOT_DIR
}
/windows_dependencies CACHE STRING
"path to dependencies"
)
ENDIF
(
WIN32
)
SET
(
CMAKE_MODULE_PATH
${
CGoGN_ROOT_DIR
}
/cmake_modules/
)
SET
(
CGoGN_SRC_DIR
${
CGoGN_ROOT_DIR
}
/CGoGN
)
...
...
@@ -14,6 +18,29 @@ INCLUDE(${CGoGN_ROOT_DIR}/cmake_modules/functions.cmake)
setBuildType
()
SET
(
SCHNApps_ROOT_DIR
${
CGoGN_ROOT_DIR
}
/SCHNApps
)
IF
(
WIN32
)
IF
(
CGoGN_WITH_QTCREATOR
)
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
ELSE
()
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin/
)
SET
(
EXECUTABLE_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/bin
)
ENDIF
()
# file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/plugins_default_directory.h
# \#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${SCHNApps_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}\" )
link_directories
(
${
CGoGN_ROOT_DIR
}
/bin/
${
ConfigurationName
}
)
ELSE
()
SET
(
LIBRARY_OUTPUT_PATH
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
# file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/plugins_default_directory.h
# \#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}\" )
link_directories
(
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
ENDIF
()
# PythonQt third-party dependency
ADD_SUBDIRECTORY
(
${
CGoGN_ROOT_DIR
}
/ThirdParty/PythonQt ThirdParty_PythonQt
)
find_package
(
OpenGL REQUIRED
)
find_package
(
ZLIB REQUIRED
)
...
...
@@ -21,7 +48,7 @@ find_package(GLEW REQUIRED)
find_package
(
Qt4 REQUIRED
)
#find_package(QGLViewer REQUIRED)
find_package
(
PythonLibs 2.7 REQUIRED
)
find_package
(
SuiteSparse REQUIRED
)
#
find_package(SuiteSparse REQUIRED)
#find_package(SuperLU REQUIRED)
...
...
@@ -37,8 +64,6 @@ SET( QT_USE_QTSVG TRUE )
INCLUDE
(
${
QT_USE_FILE
}
)
#ADD_DEFINITIONS(${QT_DEFINITIONS})
# PythonQt third-party dependency
ADD_SUBDIRECTORY
(
${
CGoGN_ROOT_DIR
}
/ThirdParty/PythonQt ThirdParty_PythonQt
)
# CGoGN compiled in one or several libs
...
...
@@ -77,86 +102,42 @@ endif(CMAKE_COMPILER_IS_GNUCXX)
SET
(
SCHNApps_ROOT_DIR
${
CGoGN_ROOT_DIR
}
/SCHNApps
)
SET
(
EXECUTABLE_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/bin/
${
CMAKE_BUILD_TYPE
}
)
SET
(
LIBRARY_OUTPUT_PATH
${
SCHNApps_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
# for application auto selection of plugin directory
file
(
WRITE
${
CMAKE_CURRENT_BINARY_DIR
}
/plugins_default_directory.h
\
#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${SCHNApps_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}\" )
file
(
GLOB_RECURSE
SCHNApps_FILES
${
SCHNApps_ROOT_DIR
}
/src/*.cpp
${
SCHNApps_ROOT_DIR
}
/include/*.h
${
SCHNApps_ROOT_DIR
}
/include/*.hpp
)
file
(
GLOB_RECURSE
SCHNApps_UI_FILES
${
SCHNApps_ROOT_DIR
}
/forms/*.ui
)
SET
(
SCHNApps_QOBJECT_FILES
${
SCHNApps_ROOT_DIR
}
/include/camera.h
${
SCHNApps_ROOT_DIR
}
/include/mapHandler.h
${
SCHNApps_ROOT_DIR
}
/include/cellSelector.h
${
SCHNApps_ROOT_DIR
}
/include/plugin.h
${
SCHNApps_ROOT_DIR
}
/include/plugin_interaction.h
${
SCHNApps_ROOT_DIR
}
/include/plugin_processing.h
${
SCHNApps_ROOT_DIR
}
/include/view.h
${
SCHNApps_ROOT_DIR
}
/include/schnapps.h
${
SCHNApps_ROOT_DIR
}
/include/viewButtonArea.h
${
SCHNApps_ROOT_DIR
}
/include/controlDock_cameraTab.h
${
SCHNApps_ROOT_DIR
}
/include/controlDock_pluginTab.h
${
SCHNApps_ROOT_DIR
}
/include/controlDock_mapTab.h
${
SCHNApps_ROOT_DIR
}
/include/colorComboBox.h
${
SCHNApps_ROOT_DIR
}
/include/dialogList.h
)
link_directories
(
${
CGoGN_ROOT_DIR
}
/lib/
${
CMAKE_BUILD_TYPE
}
)
INCLUDE_DIRECTORIES
(
${
CGoGN_SRC_DIR
}
/include
${
CGoGN_ROOT_DIR
}
/ThirdParty/PythonQt/src/
${
SCHNApps_ROOT_DIR
}
/include
${
EXT_INCLUDES
}
${
CMAKE_CURRENT_SOURCE_DIR
}
${
CMAKE_CURRENT_BINARY_DIR
}
# ${CMAKE_CURRENT_SOURCE_DIR}
# ${CMAKE_CURRENT_BINARY_DIR}
${
CMAKE_CURRENT_BINARY_DIR
}
/Plugins/schnapps/
)
QT4_WRAP_UI
(
UIC_FILES
${
SCHNApps_UI_FILES
}
)
ADD_SUBDIRECTORY
(
${
SCHNApps_ROOT_DIR
}
/Plugins Plugins
)
QT4_WRAP_CPP
(
MOC_FILES
${
SCHNApps_QOBJECT_FILES
}
INCLUDE_DIRECTORIES
(
${
CMAKE_CURRENT_SOURCE_DIR
}
)
QT4_ADD_RESOURCES
(
RCC_FILES
${
SCHNApps_ROOT_DIR
}
/resources/resources.qrc
# SCHNApps main application
file
(
GLOB_RECURSE
SCHNApps_FILES
${
SCHNApps_ROOT_DIR
}
/src/main.cpp
# ${SCHNApps_ROOT_DIR}/include/*.h
# ${SCHNApps_ROOT_DIR}/include/*.hpp
)
ADD_EXECUTABLE
(
SCHNApps
${
SCHNApps_FILES
}
${
UIC_FILES
}
${
MOC_FILES
}
${
RCC_FILES
}
)
TARGET_LINK_LIBRARIES
(
SCHNApps
SCHNAppsLib
${
CGoGN_LIBS
}
${
EXT_LIBS
}
)
ADD_SUBDIRECTORY
(
${
SCHNApps_ROOT_DIR
}
/Plugins Plugins
)
IF
(
IS_DIRECTORY
${
SCHNApps_ROOT_DIR
}
/../../Plugins
)
ADD_SUBDIRECTORY
(
${
SCHNApps_ROOT_DIR
}
/../../Plugins ExtPlugins
)
ENDIF
(
IS_DIRECTORY
${
SCHNApps_ROOT_DIR
}
/../../Plugins
)
SCHNApps/Plugins/CMakeLists.txt
View file @
1011a584
cmake_minimum_required
(
VERSION 2.8
)
ADD_SUBDIRECTORY
(
schnapps
)
ADD_SUBDIRECTORY
(
surface_import
)
ADD_SUBDIRECTORY
(
surface_render
)
ADD_SUBDIRECTORY
(
surface_renderVector
)
...
...
SCHNApps/Plugins/plugins_cmake.txt
View file @
1011a584
...
...
@@ -14,11 +14,12 @@ ADD_LIBRARY( ${PLUGIN_NAME} SHARED
)
TARGET_LINK_LIBRARIES( ${PLUGIN_NAME}
SCHNAppsLib
${CGoGN_LIBS}
${EXT_LIBS}
)
ADD_DEPENDENCIES( ${PLUGIN_NAME} SCHNApps
)
#ADD_DEPENDENCIES( ${PLUGIN_NAME} SCHNAppsLib
)
SCHNApps/Plugins/schnapps/CMakeLists.txt
0 → 100644
View file @
1011a584
cmake_minimum_required
(
VERSION 2.8
)
IF
(
WIN32
)
file
(
WRITE
${
CMAKE_CURRENT_BINARY_DIR
}
/plugins_default_directory.h
\
#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${SCHNApps_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}\" )
ELSE
()
file
(
WRITE
${
CMAKE_CURRENT_BINARY_DIR
}
/plugins_default_directory.h
\
#define\ PLUGINS_DEFAULT_DIRECTORY\ \"${CGoGN_ROOT_DIR}/lib/${CMAKE_BUILD_TYPE}\" )
ENDIF
()
# SCHNApps files to compile in a lib for dll access from plugins
file
(
GLOB_RECURSE
SCHNAppsLib_FILES
${
SCHNApps_ROOT_DIR
}
/src/camera.cpp
${
SCHNApps_ROOT_DIR
}
/src/cellSelector.cpp
${
SCHNApps_ROOT_DIR
}
/src/colorComboBox.cpp
${
SCHNApps_ROOT_DIR
}
/src/controlDock_cameraTab.cpp
${
SCHNApps_ROOT_DIR
}
/src/controlDock_mapTab.cpp
${
SCHNApps_ROOT_DIR
}
/src/controlDock_pluginTab.cpp
${
SCHNApps_ROOT_DIR
}
/src/dialogList.cpp
${
SCHNApps_ROOT_DIR
}
/src/mapHandler.cpp
${
SCHNApps_ROOT_DIR
}
/src/plugin.cpp
${
SCHNApps_ROOT_DIR
}
/src/plugin_interaction.cpp
${
SCHNApps_ROOT_DIR
}
/src/plugin_processing.cpp
${
SCHNApps_ROOT_DIR
}
/src/schnapps.cpp
${
SCHNApps_ROOT_DIR
}
/src/slot_debug.cpp
${
SCHNApps_ROOT_DIR
}
/src/view.cpp
${
SCHNApps_ROOT_DIR
}
/src/viewButtonArea.cpp
${
SCHNApps_ROOT_DIR
}
/include/*.h
${
SCHNApps_ROOT_DIR
}
/include/*.hpp
)
file
(
GLOB_RECURSE
SCHNAppsLib_UI_FILES
${
SCHNApps_ROOT_DIR
}
/forms/*.ui
)
SET
(
SCHNAppsLib_QOBJECT_FILES
${
SCHNApps_ROOT_DIR
}
/include/camera.h
${
SCHNApps_ROOT_DIR
}
/include/mapHandler.h
${
SCHNApps_ROOT_DIR
}
/include/cellSelector.h
${
SCHNApps_ROOT_DIR
}
/include/plugin.h
${
SCHNApps_ROOT_DIR
}
/include/plugin_interaction.h
${
SCHNApps_ROOT_DIR
}
/include/plugin_processing.h
${
SCHNApps_ROOT_DIR
}
/include/view.h
${
SCHNApps_ROOT_DIR
}
/include/schnapps.h
${
SCHNApps_ROOT_DIR
}
/include/viewButtonArea.h
${
SCHNApps_ROOT_DIR
}
/include/controlDock_cameraTab.h
${
SCHNApps_ROOT_DIR
}
/include/controlDock_pluginTab.h
${
SCHNApps_ROOT_DIR
}
/include/controlDock_mapTab.h
${
SCHNApps_ROOT_DIR
}
/include/colorComboBox.h
${
SCHNApps_ROOT_DIR
}
/include/dialogList.h
)
QT4_WRAP_UI
(
UIC_FILES
${
SCHNAppsLib_UI_FILES
}
)
QT4_WRAP_CPP
(
MOC_FILES
${
SCHNAppsLib_QOBJECT_FILES
}
)
QT4_ADD_RESOURCES
(
RCC_FILES
${
SCHNApps_ROOT_DIR
}
/resources/resources.qrc
)
ADD_DEFINITIONS
(
-DSCHNAPPSLIB_DLL_EXPORT -DQ_DECL_EXPORT
)
ADD_LIBRARY
(
SCHNAppsLib SHARED
${
SCHNAppsLib_FILES
}
${
UIC_FILES
}
${
MOC_FILES
}
${
RCC_FILES
}
)
TARGET_LINK_LIBRARIES
(
SCHNAppsLib
${
CGoGN_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
)
SCHNApps/include/camera.h
View file @
1011a584
...
...
@@ -5,6 +5,15 @@
#include <QGLViewer/camera.h>
#include <QGLViewer/manipulatedCameraFrame.h>
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace
CGoGN
{
...
...
@@ -13,7 +22,7 @@ namespace SCHNApps
class
SCHNApps
;
class
Camera
:
public
qglviewer
::
Camera
class
SCHNAPPS_API
Camera
:
public
qglviewer
::
Camera
{
Q_OBJECT
...
...
SCHNApps/include/cellSelector.h
View file @
1011a584
...
...
@@ -11,13 +11,22 @@
#include "slot_debug.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace
CGoGN
{
namespace
SCHNApps
{
class
CellSelectorGen
:
public
QObject
class
SCHNAPPS_API
CellSelectorGen
:
public
QObject
{
Q_OBJECT
...
...
SCHNApps/include/colorComboBox.h
View file @
1011a584
...
...
@@ -3,10 +3,19 @@
#include <QComboBox>
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
class
QColor
;
class
QWidget
;
class
ColorComboBox
:
public
QComboBox
class
SCHNAPPS_API
ColorComboBox
:
public
QComboBox
{
Q_OBJECT
Q_PROPERTY
(
QColor
color
READ
color
WRITE
setColor
USER
true
)
...
...
SCHNApps/include/controlDock_cameraTab.h
View file @
1011a584
...
...
@@ -3,6 +3,14 @@
#include "ui_controlDock_CameraTabWidget.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace
CGoGN
{
...
...
@@ -13,7 +21,7 @@ class SCHNApps;
class
Camera
;
class
View
;
class
ControlDock_CameraTab
:
public
QWidget
,
public
Ui
::
ControlDock_CameraTabWidget
class
SCHNAPPS_API
ControlDock_CameraTab
:
public
QWidget
,
public
Ui
::
ControlDock_CameraTabWidget
{
Q_OBJECT
...
...
SCHNApps/include/controlDock_mapTab.h
View file @
1011a584
...
...
@@ -5,6 +5,16 @@
#include "mapHandler.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace
CGoGN
{
...
...
@@ -19,7 +29,7 @@ namespace SCHNApps
class
SCHNApps
;
class
View
;
class
ControlDock_MapTab
:
public
QWidget
,
public
Ui
::
ControlDock_MapTabWidget
class
SCHNAPPS_API
ControlDock_MapTab
:
public
QWidget
,
public
Ui
::
ControlDock_MapTabWidget
{
Q_OBJECT
...
...
SCHNApps/include/controlDock_pluginTab.h
View file @
1011a584
...
...
@@ -3,6 +3,15 @@
#include "ui_controlDock_PluginTabWidget.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace
CGoGN
{
...
...
@@ -14,7 +23,7 @@ class Plugin;
class
PluginInteraction
;
class
View
;
class
ControlDock_PluginTab
:
public
QWidget
,
public
Ui
::
ControlDock_PluginTabWidget
class
SCHNAPPS_API
ControlDock_PluginTab
:
public
QWidget
,
public
Ui
::
ControlDock_PluginTabWidget
{
Q_OBJECT
...
...
SCHNApps/include/dialogList.h
View file @
1011a584
...
...
@@ -7,6 +7,13 @@
#include <QListWidget>
#include <QListWidgetItem>
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace
CGoGN
{
...
...
@@ -14,7 +21,7 @@ namespace CGoGN
namespace
SCHNApps
{
class
ListPopUp
:
public
QDialog
class
SCHNAPPS_API
ListPopUp
:
public
QDialog
{
Q_OBJECT
QVBoxLayout
*
m_layout
;
...
...
SCHNApps/include/mapHandler.h
View file @
1011a584
...
...
@@ -22,13 +22,21 @@
#include "Utils/vbo.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace
CGoGN
{
namespace
SCHNApps
{
class
MapHandlerGen
:
public
QObject
class
SCHNAPPS_API
MapHandlerGen
:
public
QObject
{
Q_OBJECT
...
...
SCHNApps/include/plugin.h
View file @
1011a584
...
...
@@ -3,16 +3,27 @@
#include <QtPlugin>
#include <QAction>
#include <GL/glew.h>
#include "types.h"
#ifdef WIN32
#if defined SCHNAPPSLIB_DLL_EXPORT
#define SCHNAPPS_API __declspec(dllexport)
#else
#define SCHNAPPS_API __declspec(dllimport)
#endif
#endif
namespace
CGoGN
{
namespace
SCHNApps
{
class
Plugin
:
public
QObject
class
SCHNAPPS_API
Plugin
:
public
QObject
{
Q_OBJECT
...
...
SCHNApps/include/plugin_interaction.h
View file @
1011a584
...
...
@@ -12,21 +12,22 @@ namespace SCHNApps
class
SCHNApps
;
class
View
;
class
PluginInteraction
:
public
Plugin
class
SCHNAPPS_API
PluginInteraction
:
public
Plugin
{
Q_OBJECT
friend
class
View
;
public:
PluginInteraction
();
virtual
~
PluginInteraction
();