unbreak ftclient, needs MSVC no matter what

2 files changed, 1 insertions, 69 deletions

diff --git a/ftnoir_protocol_ft/ftnoir_protocol_ft.h b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
index ba98b4b7..6bbf1bd3 100644
--- a/ftnoir_protocol_ft/ftnoir_protocol_ft.h
+++ b/ftnoir_protocol_ft/ftnoir_protocol_ft.h
@@ -38,7 +38,7 @@
 #include <QMutexLocker>
 #include "compat/compat.h"
 #include "opentrack/options.hpp"
-#include "fttypes.h"
+#include "../freetrackclient/fttypes.h"
 using namespace options;
 
 struct settings {
diff --git a/ftnoir_protocol_ft/fttypes.h b/ftnoir_protocol_ft/fttypes.h
deleted file mode 100644
index f41350c8..00000000
--- a/ftnoir_protocol_ft/fttypes.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/************************************************************************************
- * * FTTypes            FTTypes contains the specific type definitions for the      *
- * *                    FreeTrack protocol.                                         *
- * *                    It was loosely translated from FTTypes.pas                  *
- * *                    which was created by the FreeTrack-team.                    *
- * *                                                                                *
- * * Wim Vriend (Developing)                                                        *
- * * Ron Hendriks (Testing and Research)                                            *
- * *                                                                                *
- * * Homepage               <http://facetracknoir.sourceforge.net/home/default.htm> *
- * *                                                                                *
- * * This program is distributed in the hope that it will be useful, but            *
- * * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY     *
- * * or FITNESS FOR A PARTICULAR PURPOSE.                                           *
- * *                                                                                *
- * * The FTTypes sources were translated from the original Delphi sources           *
- * * created by the FreeTrack developers.                                           *
- */
-
-#pragma once
-
-#ifndef _MSC_VER
-#   include <inttypes.h>
-#else
-typedef unsigned __int32 uint32_t;
-#endif
-
-#define FREETRACK_HEAP "FT_SharedMem"
-#define FREETRACK_MUTEX "FT_Mutext"
-
-/* only 6 headpose floats and the data id are filled -sh */
-typedef struct __FTData {
-    int DataID;
-    int CamWidth;
-    int CamHeight;
-    /* virtual pose */
-    float Yaw;   /* positive yaw to the left */
-    float Pitch; /* positive pitch up */
-    float Roll;  /* positive roll to the left */
-    float X;
-    float Y;
-    float Z;
-    /* raw pose with no smoothing, sensitivity, response curve etc. */
-    float RawYaw;
-    float RawPitch;
-    float RawRoll;
-    float RawX;
-    float RawY;
-    float RawZ;
-    /* raw points, sorted by Y, origin top left corner */
-    float X1;
-    float Y1;
-    float X2;
-    float Y2;
-    float X3;
-    float Y3;
-    float X4;
-    float Y4;
-} FTData;
-
-/* we add some shit at the end for other legacy proto, sadly */
-
-typedef struct __FTHeap {
-    FTData data;
-    int32_t GameID;
-    unsigned char table[8];
-    int32_t GameID2;
-} FTHeap;