diff options
| -rw-r--r-- | contrib-noinst/important-stuff/game_data.c | 1 | ||||
| -rw-r--r-- | proto-ft/ftnoir_protocol_ft.cpp | 4 | ||||
| -rw-r--r-- | tracker-kinect-face/CMakeLists.txt | 2 |
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}" |