diff options
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | ftnoir_tracker_ht/ht-api.h | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4e5e6061..610d831f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -331,13 +331,13 @@ if(OpenCV_FOUND) target_link_libraries(opentrack-filter-kalman ${OpenCV_LIBS}) target_include_directories(opentrack-filter-kalman SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) - - opentrack_library(opentrack-tracker-ht ftnoir_tracker_ht) - target_link_libraries(opentrack-tracker-ht opentrack-compat) - target_include_directories(opentrack-tracker-ht SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) - link_with_dinput8(opentrack-tracker-ht) endif() +opentrack_library(opentrack-tracker-ht ftnoir_tracker_ht) +target_link_libraries(opentrack-tracker-ht opentrack-compat) +target_include_directories(opentrack-tracker-ht SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS}) +link_with_dinput8(opentrack-tracker-ht) + link_with_dinput8(opentrack-tracker-joystick) if(SDK_RIFT) diff --git a/ftnoir_tracker_ht/ht-api.h b/ftnoir_tracker_ht/ht-api.h index ed866e16..77903bac 100644 --- a/ftnoir_tracker_ht/ht-api.h +++ b/ftnoir_tracker_ht/ht-api.h @@ -9,7 +9,7 @@ #if !defined(_WIN32) && !defined(_isnan) # define _isnan isnan #endif -#include <opencv2/core.hpp> +//#include <opencv2/core.hpp> struct ht_context; typedef struct ht_context headtracker_t; @@ -44,6 +44,6 @@ typedef struct { HT_API(headtracker_t*) ht_make_context(const ht_config_t* config, const char* filename); HT_API(void) ht_free_context(headtracker_t* ctx); -HT_API(const cv::Mat) ht_get_bgr_frame(headtracker_t* ctx); +//HT_API(const cv::Mat) ht_get_bgr_frame(headtracker_t* ctx); HT_API(bool) ht_cycle(headtracker_t* ctx, ht_result_t* euler); HT_API(void) ht_reset(headtracker_t* ctx); |