summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp2
-rw-r--r--ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h2
-rw-r--r--ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp2
-rw-r--r--ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp2
-rw-r--r--ftnoir_protocol_ft/ftnoir_protocol_ft.h2
-rw-r--r--ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp2
-rw-r--r--ftnoir_protocol_mouse/ftnoir_protocol_mouse.h2
-rw-r--r--ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp2
-rw-r--r--ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp2
-rw-r--r--ftnoir_protocol_sc/ftnoir_protocol_sc.cpp2
-rw-r--r--ftnoir_protocol_sc/ftnoir_protocol_sc.h2
-rw-r--r--ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp2
-rw-r--r--ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp2
-rw-r--r--ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp2
-rw-r--r--ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h2
-rw-r--r--ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp2
-rw-r--r--ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp2
-rw-r--r--ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h2
-rw-r--r--ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp2
-rw-r--r--ftnoir_tracker_joystick/ftnoir_tracker_joystick.h2
-rw-r--r--ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp2
-rw-r--r--ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp2
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift.cpp2
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift.h2
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp2
-rw-r--r--ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp2
26 files changed, 26 insertions, 26 deletions
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
index 632d502a..a91c75c0 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.cpp
@@ -25,7 +25,7 @@
* to games, using the FSUIPC.dll. *
********************************************************************************/
#include "ftnoir_protocol_fsuipc.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
/** constructor **/
FTNoIR_Protocol::FTNoIR_Protocol()
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
index ff8d3b7f..dcdd8098 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc.h
@@ -31,7 +31,7 @@
#include <windows.h>
#include <stdlib.h>
#include "FSUIPC_User.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
#include "ui_ftnoir_fsuipccontrols.h"
#include <QMessageBox>
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
index d97cff99..89823499 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dialog.cpp
@@ -23,7 +23,7 @@
* *
********************************************************************************/
#include "ftnoir_protocol_fsuipc.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
FSUIPCControls::FSUIPCControls() :
QWidget()
diff --git a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp
index 57b174c5..6cffc4f3 100644
--- a/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp
+++ b/ftnoir_protocol_fsuipc/ftnoir_protocol_fsuipc_dll.cpp
@@ -23,7 +23,7 @@
* *
********************************************************************************/
#include "ftnoir_protocol_fsuipc.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
extern "C" FTNOIR_PROTOCOL_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata(void)
{
diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
index 0af9ff07..01682e69 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
@@ -27,7 +27,7 @@
#pragma once
#include "ftnoir_protocol_base/ftnoir_protocol_base.h"
#include "ui_ftnoir_ftcontrols.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
#include "fttypes.h"
#include <QMessageBox>
#include <QSettings>
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
index cc8aa11e..52f9b53b 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.cpp
@@ -27,7 +27,7 @@
* but no face-tracking. *
********************************************************************************/
#include "ftnoir_protocol_mouse.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
void FTNoIR_Protocol::sendHeadposeToGame(const double *headpose ) {
double fMouse_X = 0;
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
index 01f283d3..f1e752b0 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse.h
@@ -40,7 +40,7 @@
#include <QFile>
#include <windows.h>
#include <winuser.h>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
#include "facetracknoir/options.h"
using namespace options;
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
index 22b7024c..63524de9 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dialog.cpp
@@ -23,7 +23,7 @@
* *
********************************************************************************/
#include "ftnoir_protocol_mouse.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
MOUSEControls::MOUSEControls() : _proto(nullptr)
{
diff --git a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
index 54f6b307..0f63b290 100644
--- a/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
+++ b/ftnoir_protocol_mouse/ftnoir_protocol_mouse_dll.cpp
@@ -23,7 +23,7 @@
* *
********************************************************************************/
#include "ftnoir_protocol_mouse.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
extern "C" FTNOIR_PROTOCOL_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
{
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
index 2714e980..7de762ac 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.cpp
@@ -27,7 +27,7 @@
* must be treated as such... *
********************************************************************************/
#include "ftnoir_protocol_sc.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
importSimConnect_CameraSetRelative6DOF FTNoIR_Protocol::simconnect_set6DOF;
HANDLE FTNoIR_Protocol::hSimConnect = 0; // Handle to SimConnect
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc.h b/ftnoir_protocol_sc/ftnoir_protocol_sc.h
index a13c0097..758ca1ec 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc.h
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc.h
@@ -29,7 +29,7 @@
#pragma once
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0502
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
//
// Prevent the SimConnect manifest from being merged in the application-manifest
// This is necessary to run FaceTrackNoIR on a PC without FSX
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
index c7428d77..ea55cc1b 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc_dialog.cpp
@@ -24,7 +24,7 @@
********************************************************************************/
#include "ftnoir_protocol_sc.h"
#include <QDebug>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
SCControls::SCControls() :
QWidget()
diff --git a/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp b/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp
index 0a52fa96..e4741d42 100644
--- a/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp
+++ b/ftnoir_protocol_sc/ftnoir_protocol_sc_dll.cpp
@@ -24,7 +24,7 @@
********************************************************************************/
#include "ftnoir_protocol_sc.h"
#include <QDebug>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
extern "C" FTNOIR_PROTOCOL_BASE_EXPORT Metadata* CALLING_CONVENTION GetMetadata()
{
diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp
index a3a5cb5f..5f469e7f 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.cpp
@@ -1,5 +1,5 @@
#include "ftnoir_protocol_vjoy.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
#include <ftnoir_tracker_base/ftnoir_tracker_types.h>
/** constructor **/
diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
index 873b4e3c..24a4e28f 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy.h
@@ -33,7 +33,7 @@
#include <QMessageBox>
#include <QSettings>
#include <math.h>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
#include <windows.h>
#define FT_PROGRAMID "FT_ProgramID"
diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp
index febb7b18..66aa559e 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dialog.cpp
@@ -1,5 +1,5 @@
#include "ftnoir_protocol_vjoy.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
VJoyControls::VJoyControls() : QWidget()
{
diff --git a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp
index 5cb5ef05..180cd683 100644
--- a/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp
+++ b/ftnoir_protocol_vjoy/ftnoir_protocol_vjoy_dll.cpp
@@ -1,6 +1,6 @@
#include "ftnoir_protocol_vjoy.h"
#include <QDebug>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
FTNoIR_ProtocolDll::FTNoIR_ProtocolDll() {
}
diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h b/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h
index ffdc5262..af2ec00c 100644
--- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h
+++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco_dll.h
@@ -6,7 +6,7 @@
*/
#include "ftnoir_tracker_base/ftnoir_tracker_base.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
//-----------------------------------------------------------------------------
class TrackerDll : public Metadata
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp
index f9789dce..806ba91e 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.cpp
@@ -1,5 +1,5 @@
#include "ftnoir_tracker_joystick.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
#undef NDEBUG
#include <QMutexLocker>
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h
index 06d06186..2c1bc731 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick.h
@@ -16,7 +16,7 @@
#include <QMutex>
#include <QFrame>
#include <cmath>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
#ifndef DIRECTINPUT_VERSION
# define DIRECTINPUT_VERSION 0x800
#endif
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
index b0766634..7f24a8f1 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dialog.cpp
@@ -1,5 +1,5 @@
#include "ftnoir_tracker_joystick.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
static BOOL CALLBACK EnumJoysticksCallback( const DIDEVICEINSTANCE* pdidInstance, VOID* pContext )
{
diff --git a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp
index 325d24a4..f5867fea 100644
--- a/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp
+++ b/ftnoir_tracker_joystick/ftnoir_tracker_joystick_dll.cpp
@@ -1,6 +1,6 @@
#include "ftnoir_tracker_joystick.h"
#include <QDebug>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
void FTNoIR_TrackerDll::getFullName(QString *strToBeFilled)
{
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
index 0a2ded7d..1c38e0fa 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.cpp
@@ -1,6 +1,6 @@
/* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */
#include "ftnoir_tracker_rift.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
#include "OVR_CAPI.h"
#include "Kernel/OVR_Math.h"
#include <cstdio>
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift.h b/ftnoir_tracker_rift/ftnoir_tracker_rift.h
index 26496bc2..54a8bcad 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift.h
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift.h
@@ -4,7 +4,7 @@
#include <QMessageBox>
#include <QWaitCondition>
#include <cmath>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
#include "OVR.h"
#include <memory>
#include "facetracknoir/options.h"
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
index ad532100..0c249257 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift_dialog.cpp
@@ -1,5 +1,5 @@
#include "ftnoir_tracker_rift.h"
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
TrackerControls::TrackerControls() :
QWidget()
diff --git a/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp b/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp
index 2b24411c..3edee290 100644
--- a/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp
+++ b/ftnoir_tracker_rift/ftnoir_tracker_rift_dll.cpp
@@ -1,7 +1,7 @@
/* Copyright: "i couldn't care less what anyone does with the 5 lines of code i wrote" - mm0zct */
#include "ftnoir_tracker_rift.h"
#include <QDebug>
-#include "facetracknoir/global-settings.h"
+#include "facetracknoir/plugin-support.h"
FTNoIR_TrackerDll::FTNoIR_TrackerDll() {
//populate the description strings