From b0b7c2b0e1762a7c0058e7f507a3b7cc9a03daf6 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 16 Jul 2015 11:29:59 +0200 Subject: all: use macros for symbol exposure --- ftnoir_tracker_udp/ftnoir_tracker_udp.cpp | 6 ++---- ftnoir_tracker_udp/ftnoir_tracker_udp.h | 1 + ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp | 4 ---- ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp | 7 ------- 4 files changed, 3 insertions(+), 15 deletions(-) delete mode 100644 ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp (limited to 'ftnoir_tracker_udp') diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp index ab8c8c86..b60e7ccc 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.cpp @@ -54,7 +54,5 @@ void FTNoIR_Tracker::data(double *data) data[Yaw + i] += values[indices[i]]; } -extern "C" OPENTRACK_EXPORT ITracker* GetConstructor() -{ - return new FTNoIR_Tracker; -} + +OPENTRACK_DECLARE_TRACKER(FTNoIR_Tracker, TrackerControls, FTNoIR_TrackerDll) diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp.h b/ftnoir_tracker_udp/ftnoir_tracker_udp.h index 95a3fb4f..8dca3833 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp.h +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp.h @@ -57,3 +57,4 @@ public: QString name() { return QString("UDP sender"); } QIcon icon() { return QIcon(":/images/facetracknoir.png"); } }; + diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp index bab88db0..5e7d5437 100644 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp +++ b/ftnoir_tracker_udp/ftnoir_tracker_udp_dialog.cpp @@ -24,7 +24,3 @@ void TrackerControls::doCancel() { this->close(); } -extern "C" OPENTRACK_EXPORT ITrackerDialog* GetDialog( ) -{ - return new TrackerControls; -} diff --git a/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp b/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp deleted file mode 100644 index e2b10455..00000000 --- a/ftnoir_tracker_udp/ftnoir_tracker_udp_dll.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "ftnoir_tracker_udp.h" -#include "opentrack/plugin-api.hpp" - -extern "C" OPENTRACK_EXPORT Metadata* GetMetadata() -{ - return new FTNoIR_TrackerDll; -} -- cgit v1.2.3