summaryrefslogtreecommitdiffhomepage
path: root/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp')
-rw-r--r--ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp b/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp
index 5f01568f..70326499 100644
--- a/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp
+++ b/ftnoir_tracker_sm/ftnoir_tracker_faceapi_dll.cpp
@@ -32,6 +32,7 @@
*/
#include "ftnoir_tracker_sm.h"
#include <QDebug>
+#include "facetracknoir/global-settings.h"
FTNoIR_TrackerDll::FTNoIR_TrackerDll() {
//populate the description strings
@@ -67,7 +68,7 @@ void FTNoIR_TrackerDll::getDescription(QString *strToBeFilled)
void FTNoIR_TrackerDll::getIcon(QIcon *icon)
{
- *icon = QIcon(":/images/SeeingMachines.ico");
+ *icon = QIcon(":/images/sm.png");
};
////////////////////////////////////////////////////////////////////////////////
@@ -77,9 +78,9 @@ void FTNoIR_TrackerDll::getIcon(QIcon *icon)
// GetTrackerDll - Undecorated name, which can be easily used with GetProcAddress
// Win32 API function.
// _GetTrackerDll@0 - Common name decoration for __stdcall functions in C language.
-#pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")
+//#pragma comment(linker, "/export:GetTrackerDll=_GetTrackerDll@0")
-FTNOIR_TRACKER_BASE_EXPORT ITrackerDllPtr __stdcall GetTrackerDll()
+extern "C" FTNOIR_TRACKER_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
{
return new FTNoIR_TrackerDll;
}