summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2025-05-10 19:00:01 +0200
committerStanislaw Halik <sthalik@misaki.pl>2025-05-16 08:54:15 +0200
commit5680cea129499677416082cec0ff6721e2155911 (patch)
treee484f9056febcd31f964354cd41274b2ae351882
parent997f5b187a076e01ba9524ab1830ca6f7dc5f406 (diff)
zz
-rw-r--r--contrib-noinst/important-stuff/game_data.c1
-rw-r--r--proto-ft/ftnoir_protocol_ft.cpp4
-rw-r--r--tracker-kinect-face/CMakeLists.txt2
3 files changed, 6 insertions, 1 deletions
diff --git a/contrib-noinst/important-stuff/game_data.c b/contrib-noinst/important-stuff/game_data.c
index 48774187..4947fc61 100644
--- a/contrib-noinst/important-stuff/game_data.c
+++ b/contrib-noinst/important-stuff/game_data.c
@@ -2,6 +2,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <mxml.h>
+#include <mxml-private.h>
#include <stdbool.h>
#include <stdint.h>
#include <sys/stat.h>
diff --git a/proto-ft/ftnoir_protocol_ft.cpp b/proto-ft/ftnoir_protocol_ft.cpp
index c7501262..013dc363 100644
--- a/proto-ft/ftnoir_protocol_ft.cpp
+++ b/proto-ft/ftnoir_protocol_ft.cpp
@@ -6,6 +6,10 @@
* copyright notice and this permission notice appear in all copies.
*/
+#ifdef __CLION_IDE__
+#define _CRT_USE_BUILTIN_OFFSETOF
+#endif
+
#include "compat/library-path.hpp"
#include "ftnoir_protocol_ft.h"
diff --git a/tracker-kinect-face/CMakeLists.txt b/tracker-kinect-face/CMakeLists.txt
index d205a764..86429bd2 100644
--- a/tracker-kinect-face/CMakeLists.txt
+++ b/tracker-kinect-face/CMakeLists.txt
@@ -34,7 +34,7 @@ if (WIN32 AND opentrack-intel)
# Install Kinect Face Database
install(DIRECTORY "${SDK_KINECT20}/Redist/Face/${kinect-arch-dir}/NuiDatabase" DESTINATION "${opentrack-libexec}")
- set(redist-dir "${CMAKE_SOURCE_DIR}/redist/${kinect-arch-dir}")
+ #set(redist-dir "${CMAKE_SOURCE_DIR}/redist/${kinect-arch-dir}")
#install(
# FILES "${redist-dir}/msvcp110.dll" "${redist-dir}/msvcr110.dll"
# DESTINATION "${opentrack-libexec}"