diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-17 08:28:51 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-07-17 08:28:51 +0200 |
| commit | e3a5755b1c675e66163a879ee5e5290bf0b01251 (patch) | |
| tree | 4de6d67c1b157459d92653e201b0a3846d40d8f7 /ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp | |
| parent | fe8fa2db6a8b01e06d6fa7129a38211ce164895e (diff) | |
| parent | 45b346cc1a4a7b7e6716ec8ee0f58ad03c60d865 (diff) | |
Merge branch 'unstable' into trackhat-ui
Diffstat (limited to 'ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp')
| -rw-r--r-- | ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp b/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp index 5a4e9c74..72b7d3ed 100644 --- a/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp +++ b/ftnoir_tracker_hatire/ftnoir_tracker_hat.cpp @@ -603,11 +603,13 @@ void FTNoIR_Tracker::Log(QString message) // _GetTracker@0 - Common name decoration for __stdcall functions in C language. //////////////////////////////////////////////////////////////////////////////// #ifdef OPENTRACK_API -extern "C" OPENTRACK_EXPORT ITracker* GetConstructor() +#include "ftnoir_tracker_hat_dialog.h" +OPENTRACK_DECLARE_TRACKER(FTNoIR_Tracker, TrackerControls, TrackerDll) #else #pragma comment(linker, "/export:GetTracker=_GetTracker@0") FTNOIR_TRACKER_BASE_EXPORT ITrackerPtr __stdcall GetTracker() -#endif { - return new FTNoIR_Tracker; + return new FTNoIR_Tracker; } +#endif + |