diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2015-11-01 08:56:23 +0100 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-11-01 08:56:23 +0100 |
commit | 7e3807d048c5e0a8e0aa64fb49807bf5dfd11fc1 (patch) | |
tree | 22029a8b36a593585dcd962b81ff80199a4f9984 /pose-widget | |
parent | 664aefb41351113fbd43962aa534befe18ff9d4a (diff) | |
parent | 0ff658f908bc3e07bca9987dfd5b7c365b7d8353 (diff) |
Merge branch 'unstable' into trackhat
Diffstat (limited to 'pose-widget')
-rw-r--r-- | pose-widget/CMakeLists.txt | 7 | ||||
-rw-r--r-- | pose-widget/glwidget.h | 9 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pose-widget/CMakeLists.txt b/pose-widget/CMakeLists.txt index 66891c21..66cafef7 100644 --- a/pose-widget/CMakeLists.txt +++ b/pose-widget/CMakeLists.txt @@ -1,6 +1 @@ -opentrack_boilerplate(opentrack-pose-widget NO-LIBRARY) -opentrack_qt(opentrack-pose-widget) -add_library(opentrack-pose-widget STATIC ${opentrack-pose-widget-all}) -opentrack_compat(opentrack-pose-widget) -target_include_directories(opentrack-pose-widget PUBLIC pose-widget/) # else Qt moc breaks -target_link_libraries(opentrack-pose-widget ${MY_QT_LIBS}) +opentrack_boilerplate(opentrack-pose-widget NO-LINKER-SCRIPT) diff --git a/pose-widget/glwidget.h b/pose-widget/glwidget.h index 81517399..fca3502d 100644 --- a/pose-widget/glwidget.h +++ b/pose-widget/glwidget.h @@ -7,12 +7,19 @@ #pragma once +#include <QtGlobal> #include <QWidget> #include <QPixmap> #include "opentrack/plugin-api.hpp" #include "opentrack/simple-mat.hpp" -class GLWidget : public QWidget +#ifdef BUILD_opentrack_pose_widget +# define POSE_WIDGET_EXPORT Q_DECL_EXPORT +#else +# define POSE_WIDGET_EXPORT Q_DECL_IMPORT +#endif + +class POSE_WIDGET_EXPORT GLWidget : public QWidget { public: using num = float; |