diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2023-03-17 21:41:46 +0100 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2023-03-17 21:41:55 +0100 |
| commit | b35641308049d7484296cebc68ec7882d966c6e8 (patch) | |
| tree | 5afc65afd3d30c5a33c6609cec9ab0109a42b242 | |
| parent | 3734494677c4f9aba863ffebfecb28755c6e0493 (diff) | |
tracker/beam: trivial build fixes only
Issue: #1625
| -rw-r--r-- | sdk-paths-sthalik@Clang-windows.cmake | 2 | ||||
| -rw-r--r-- | sdk-paths-sthalik@GNU-windows.cmake | 2 | ||||
| -rw-r--r-- | sdk-paths-sthalik@MSVC-windows.cmake | 4 | ||||
| -rw-r--r-- | tracker-eyeware-beam/CMakeLists.txt | 4 |
4 files changed, 4 insertions, 8 deletions
diff --git a/sdk-paths-sthalik@Clang-windows.cmake b/sdk-paths-sthalik@Clang-windows.cmake index 25fec0a6..895d68b2 100644 --- a/sdk-paths-sthalik@Clang-windows.cmake +++ b/sdk-paths-sthalik@Clang-windows.cmake @@ -31,8 +31,6 @@ setq(SDK_VJOYSTICK "vjoystick") setq(SDK_REALSENSE "RSSDK-R2") -setq(SDK_EYEWARE_BEAM "eyeware-beam-sdk") - # WARNING: this is utter experimental nonsense set(_cxxflags -Weverything diff --git a/sdk-paths-sthalik@GNU-windows.cmake b/sdk-paths-sthalik@GNU-windows.cmake index fe496ae8..b9617719 100644 --- a/sdk-paths-sthalik@GNU-windows.cmake +++ b/sdk-paths-sthalik@GNU-windows.cmake @@ -31,8 +31,6 @@ setq(SDK_VJOYSTICK "vjoystick") setq(SDK_REALSENSE "RSSDK-R2") -setq(SDK_EYEWARE_BEAM "eyeware-beam-sdk") - set(base-flags "-Wall -Wextra -Wpedantic") set(CMAKE_C_FLAGS "-std=c11 ${base-flags} -ggdb ${CMAKE_C_FLAGS}") set(CMAKE_CXX_FLAGS "-std=c++17 ${base-flags} -ggdb ${CMAKE_CXX_FLAGS}") diff --git a/sdk-paths-sthalik@MSVC-windows.cmake b/sdk-paths-sthalik@MSVC-windows.cmake index c6a93f69..be85db85 100644 --- a/sdk-paths-sthalik@MSVC-windows.cmake +++ b/sdk-paths-sthalik@MSVC-windows.cmake @@ -24,7 +24,7 @@ setq(EIGEN3_INCLUDE_DIR "eigen") setq(OpenCV_DIR "opencv/build/install") setq(SDL2_DIR "SDL2-win32") setq(SDK_ARUCO_LIBPATH "aruco/build/src/aruco.lib") -setq(SDK_EYEWARE_BEAM "eyeware-beam-sdk") +setq(SDK_EYEWARE_BEAM "BeamSDK-Windows64-1.1.0") setq(SDK_FSUIPC "fsuipc") setq(SDK_HYDRA "SixenseSDK") setq(SDK_KINECT20 "Kinect-v2.0") @@ -35,7 +35,7 @@ setq(SDK_RIFT_140 "ovr_sdk_win_23.0.0/LibOVR") setq(SDK_VALVE_STEAMVR "steamvr") setq(SDK_VJOYSTICK "vjoystick") setq(ONNXRuntime_DIR "onnxruntime-1.12.1") -setq(SDK_TRACKHAT_SENSOR "../trackhat/trackhat-c-library-driver/build/install") +setq(SDK_TRACKHAT_SENSOR "trackhat-c-library-driver/build/install") set(CMAKE_ASM_NASM_COMPILER nasm.exe CACHE FILEPATH "" FORCE) diff --git a/tracker-eyeware-beam/CMakeLists.txt b/tracker-eyeware-beam/CMakeLists.txt index 3a75f61a..73ea231a 100644 --- a/tracker-eyeware-beam/CMakeLists.txt +++ b/tracker-eyeware-beam/CMakeLists.txt @@ -8,9 +8,9 @@ if(WIN32 AND SDK_EYEWARE_BEAM) otr_module(tracker-eyeware-beam) target_include_directories(${self} SYSTEM PRIVATE "${SDK_EYEWARE_BEAM}/API/cpp/include") - target_link_directories(${self} SYSTEM PRIVATE "${SDK_EYEWARE_BEAM}/API/cpp/lib") + target_link_directories(${self} PRIVATE "${SDK_EYEWARE_BEAM}/API/cpp/lib") set(dll "${SDK_EYEWARE_BEAM}/API/cpp/lib/tracker_client.dll" "${SDK_EYEWARE_BEAM}/API/cpp/lib/libsodium.dll") - set(lib tracker_client) + set(lib tracker_client.lib) #message(${self}) #message(${dll}) |