cgogn · untereiner · Jan 23, 2019 · Jan 22, 2019 · Jan 22, 2019 · Jan 4, 2019
diff --git a/schnapps/core/CMakeLists.txt b/schnapps/core/CMakeLists.txt
@@ -2,6 +2,10 @@ project(schnapps_core
 	LANGUAGES CXX
 )
 
+# Hide symbols by default
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
+
 find_package(cgogn_core REQUIRED)
 find_package(cgogn_rendering REQUIRED)
 find_package(QOGLViewer REQUIRED)
@@ -11,7 +15,6 @@ add_library(schnapps::core ALIAS schnapps_core)
 
 target_sources(${PROJECT_NAME}
 	PRIVATE
-	    "${CMAKE_CURRENT_LIST_DIR}/dll.h"
 		"${CMAKE_CURRENT_LIST_DIR}/schnapps_window.h"
 		"${CMAKE_CURRENT_LIST_DIR}/schnapps_window.cpp"
 		"${CMAKE_CURRENT_LIST_DIR}/schnapps_window_factory.h"
@@ -56,8 +59,6 @@ target_sources(${PROJECT_NAME}
 		"${SCHNAPPS_SOURCE_DIR}/schnapps/resources/resources.qrc"
 )
 
-target_compile_definitions(${PROJECT_NAME} PRIVATE "SCHNAPPS_CORE_DLL_EXPORT")
-
 if (SCHNAPPS_ALIGNED_VEC3)
 	target_compile_definitions(${PROJECT_NAME} PUBLIC "SCHNAPPS_USE_ALIGNEDVEC3")
 endif()
@@ -74,11 +75,14 @@ set_target_properties(${PROJECT_NAME} PROPERTIES
 										EXPORT_NAME core)
 
 target_include_directories(${PROJECT_NAME} PUBLIC
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+	$<BUILD_INTERFACE:${CMAKE_BINARY_DIR}>
 	$<BUILD_INTERFACE:${SCHNAPPS_SOURCE_DIR}>
 	$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
 )
 
+# Write out schnapps_core_export.h to the current binary directory
+generate_export_header(schnapps_core)
+
 target_link_libraries(${PROJECT_NAME}
 	cgogn::core
 	cgogn::rendering
@@ -95,9 +99,15 @@ add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD
 # the trailing slash is IMPORTANT, see https://cmake.org/pipermail/cmake/2009-December/033850.html
 install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/
 	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/schnapps/core
+	COMPONENT schnapps_core_headers
 	FILES_MATCHING PATTERN "*.h"
 )
 
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/schnapps_core_export.h
+	DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/schnapps/core
+	COMPONENT schnapps_core_headers
+)
+
 schnapps_create_package("${CMAKE_CURRENT_SOURCE_DIR}")
 
 set_target_properties (${PROJECT_NAME} PROPERTIES FOLDER core)
diff --git a/schnapps/core/camera.h b/schnapps/core/camera.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_CAMERA_H_
 #define SCHNAPPS_CORE_CAMERA_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 #include <schnapps/core/types.h>
 
 #include <QOGLViewer/camera.h>
@@ -41,7 +42,7 @@ class View;
 * A camera object is generated with each new view
 * Cameras can be shared among views.
 */
-class SCHNAPPS_CORE_API Camera : public qoglviewer::Camera
+class SCHNAPPS_CORE_EXPORT Camera : public qoglviewer::Camera
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/color_combo_box.h b/schnapps/core/color_combo_box.h
@@ -24,13 +24,14 @@
 #ifndef SCHNAPPS_CORE_COLOR_COMBO_BOX_H_
 #define SCHNAPPS_CORE_COLOR_COMBO_BOX_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 #include <QComboBox>
 
 class QColor;
 class QWidget;
 
-class SCHNAPPS_CORE_API ColorComboBox : public QComboBox
+class SCHNAPPS_CORE_EXPORT ColorComboBox : public QComboBox
 {
 	Q_OBJECT
 	Q_PROPERTY(QColor color READ color WRITE setColor USER true)

diff --git a/schnapps/core/control_dock_camera_tab.h b/schnapps/core/control_dock_camera_tab.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_CONTROL_DOCK_CAMERA_TAB_H_
 #define SCHNAPPS_CORE_CONTROL_DOCK_CAMERA_TAB_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 
 #include <ui_control_dock_camera_tab_widget.h>
 
@@ -38,7 +39,7 @@ class SCHNApps;
 class Camera;
 class View;
 
-class SCHNAPPS_CORE_API ControlDock_CameraTab : public QWidget, public Ui::ControlDock_CameraTabWidget
+class SCHNAPPS_CORE_EXPORT ControlDock_CameraTab : public QWidget, public Ui::ControlDock_CameraTabWidget
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/control_dock_camera_tab_widget.ui b/schnapps/core/control_dock_camera_tab_widget.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <exportmacro>SCHNAPPS_CORE_API</exportmacro>
+ <exportmacro>SCHNAPPS_CORE_EXPORT</exportmacro>
  <class>ControlDock_CameraTabWidget</class>
  <widget class="QWidget" name="ControlDock_CameraTabWidget">
   <property name="geometry">

diff --git a/schnapps/core/control_dock_plugin_tab.h b/schnapps/core/control_dock_plugin_tab.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_CONTROL_DOCK_PLUGIN_TAB_H_
 #define SCHNAPPS_CORE_CONTROL_DOCK_PLUGIN_TAB_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 
 #include <ui_control_dock_plugin_tab_widget.h>
 
@@ -37,7 +38,7 @@ namespace schnapps
 class SCHNApps;
 class Plugin;
 
-class SCHNAPPS_CORE_API ControlDock_PluginTab : public QWidget, public Ui::ControlDock_PluginTabWidget
+class SCHNAPPS_CORE_EXPORT ControlDock_PluginTab : public QWidget, public Ui::ControlDock_PluginTabWidget
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/control_dock_plugin_tab_widget.ui b/schnapps/core/control_dock_plugin_tab_widget.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <exportmacro>SCHNAPPS_CORE_API</exportmacro>
+ <exportmacro>SCHNAPPS_CORE_EXPORT</exportmacro>
  <class>ControlDock_PluginTabWidget</class>
  <widget class="QWidget" name="ControlDock_PluginTabWidget">
   <property name="geometry">

diff --git a/schnapps/core/dll.h b/schnapps/core/dll.h
diff --git a/schnapps/core/object.h b/schnapps/core/object.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_OBJECT_H_
 #define SCHNAPPS_CORE_OBJECT_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 #include <schnapps/core/types.h>
 
 #include <cgogn/rendering/drawer.h>
@@ -40,7 +41,7 @@ namespace schnapps
 class View;
 class PluginProvider;
 
-class SCHNAPPS_CORE_API Object : public QObject
+class SCHNAPPS_CORE_EXPORT Object : public QObject
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/plugin.h b/schnapps/core/plugin.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_PLUGIN_H_
 #define SCHNAPPS_CORE_PLUGIN_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 #include <schnapps/core/settings.h>
 
 #include <QtPlugin>
@@ -34,7 +35,7 @@ namespace schnapps
 
 class SCHNApps;
 
-class SCHNAPPS_CORE_API Plugin : public QObject
+class SCHNAPPS_CORE_EXPORT Plugin : public QObject
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/plugin_interaction.h b/schnapps/core/plugin_interaction.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_PLUGIN_INTERACTION_H_
 #define SCHNAPPS_CORE_PLUGIN_INTERACTION_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 #include <schnapps/core/plugin.h>
 
 #include <QKeyEvent>
@@ -37,7 +38,7 @@ namespace schnapps
 class View;
 class Object;
 
-class SCHNAPPS_CORE_API PluginInteraction : public Plugin
+class SCHNAPPS_CORE_EXPORT PluginInteraction : public Plugin
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/plugin_processing.h b/schnapps/core/plugin_processing.h
@@ -24,15 +24,16 @@
 #ifndef SCHNAPPS_CORE_PLUGIN_PROCESSING_H_
 #define SCHNAPPS_CORE_PLUGIN_PROCESSING_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 #include <schnapps/core/plugin.h>
 
 namespace schnapps
 {
 
 class Object;
 
-class SCHNAPPS_CORE_API PluginProcessing : public Plugin
+class SCHNAPPS_CORE_EXPORT PluginProcessing : public Plugin
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/plugin_provider.h b/schnapps/core/plugin_provider.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_PLUGIN_PROVIDER_H_
 #define SCHNAPPS_CORE_PLUGIN_PROVIDER_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 #include <schnapps/core/types.h>
 #include <schnapps/core/plugin.h>
 
@@ -33,7 +34,7 @@ namespace schnapps
 
 class Object;
 
-class SCHNAPPS_CORE_API PluginProvider : public Plugin
+class SCHNAPPS_CORE_EXPORT PluginProvider : public Plugin
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/schnapps.h b/schnapps/core/schnapps.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_SCHNAPPS_H_
 #define SCHNAPPS_CORE_SCHNAPPS_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 #include <schnapps/core/settings.h>
 #include <schnapps/core/status_bar_output.h>
 #include <schnapps/core/plugin_provider.h>
@@ -52,7 +53,7 @@ class ControlDock_PluginTab;
 /**
  * @brief The SCHNApps central object application
  */
-class SCHNAPPS_CORE_API SCHNApps : public QObject
+class SCHNAPPS_CORE_EXPORT SCHNApps : public QObject
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/schnapps.ui b/schnapps/core/schnapps.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <exportmacro>SCHNAPPS_CORE_API</exportmacro>
+ <exportmacro>SCHNAPPS_CORE_EXPORT</exportmacro>
  <class>SCHNAppsWindow</class>
  <widget class="QMainWindow" name="SCHNAppsWindow">
   <property name="geometry">

diff --git a/schnapps/core/schnapps_window.cpp b/schnapps/core/schnapps_window.cpp
@@ -33,7 +33,7 @@ namespace schnapps
 /**
  * @brief generate a SCHNApps_window (no need of schnapps_window.h !)
  */
-SCHNAPPS_CORE_API std::unique_ptr<QMainWindow> schnapps_window_factory(
+SCHNAPPS_CORE_EXPORT std::unique_ptr<QMainWindow> schnapps_window_factory(
 	const QString& app_path,
 	const QString& settings_path,
 	const QString& init_plugin_name
@@ -63,6 +63,7 @@ SCHNAppsWindow::SCHNAppsWindow(
 	control_dock_tab_widget_->setLayoutDirection(Qt::LeftToRight);
 	control_dock_tab_widget_->setTabPosition(QTabWidget::North);
 	control_dock_tab_widget_->setMovable(true);
+	control_dock_tab_widget_->setUsesScrollButtons(true);
 
 	addDockWidget(Qt::LeftDockWidgetArea, control_dock_);
 	control_dock_->setVisible(true);

diff --git a/schnapps/core/schnapps_window.h b/schnapps/core/schnapps_window.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_SCHNAPPS_WINDOW_H_
 #define SCHNAPPS_CORE_SCHNAPPS_WINDOW_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 
 #include <ui_schnapps.h>
 
@@ -42,7 +43,7 @@ namespace schnapps
 
 class SCHNApps;
 
-class SCHNAPPS_CORE_API SCHNAppsWindow : public QMainWindow, public Ui::SCHNAppsWindow
+class SCHNAPPS_CORE_EXPORT SCHNAppsWindow : public QMainWindow, public Ui::SCHNAppsWindow
 {
 	Q_OBJECT
 

diff --git a/schnapps/core/schnapps_window_factory.h b/schnapps/core/schnapps_window_factory.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_SCHNAPPS_WINDOW_FACTORY_H_
 #define SCHNAPPS_CORE_SCHNAPPS_WINDOW_FACTORY_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 
 #include <QMainWindow>
 #include <QString>
@@ -36,7 +37,7 @@ namespace schnapps
 * factory of SCHNApps_Window (avoid include of schnapps_window.h)
 * definition in schnapps_window.cpp
 */
-SCHNAPPS_CORE_API std::unique_ptr<QMainWindow> schnapps_window_factory(
+SCHNAPPS_CORE_EXPORT std::unique_ptr<QMainWindow> schnapps_window_factory(
 	const QString& app_path,
 	const QString& settings_path,
 	const QString& init_plugin_name

diff --git a/schnapps/core/settings.h b/schnapps/core/settings.h
@@ -24,7 +24,8 @@
 #ifndef SCHNAPPS_CORE_SETTINGS_H_
 #define SCHNAPPS_CORE_SETTINGS_H_
 
-#include <schnapps/core/dll.h>
+#include <schnapps/core/schnapps_core_export.h>
+
 
 #include <QVariantMap>
 #include <QStringList>
@@ -38,7 +39,7 @@ namespace schnapps
 
 class SettingsWidget;
 
-class SCHNAPPS_CORE_API Settings : public QObject
+class SCHNAPPS_CORE_EXPORT Settings : public QObject
 {
 	Q_OBJECT