diff options
| -rw-r--r-- | cmake/msvc.cmake | 1 | ||||
| -rw-r--r-- | gui/process_detector.cpp | 8 | ||||
| -rw-r--r-- | sdk-paths-sthalik@MSVC-windows.cmake | 8 | ||||
| -rw-r--r-- | tracker-easy/CMakeLists.txt | 2 |
4 files changed, 12 insertions, 7 deletions
diff --git a/cmake/msvc.cmake b/cmake/msvc.cmake index 4c688226..f810ac4d 100644 --- a/cmake/msvc.cmake +++ b/cmake/msvc.cmake @@ -4,6 +4,7 @@ SET(CMAKE_SYSTEM_NAME Windows) SET(CMAKE_SYSTEM_VERSION 5.01) +set(CMAKE_SYSTEM_PROCESSOR x86) # search for programs in the host directories SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) diff --git a/gui/process_detector.cpp b/gui/process_detector.cpp index 58ea4ca9..74e8caac 100644 --- a/gui/process_detector.cpp +++ b/gui/process_detector.cpp @@ -63,7 +63,13 @@ void proc_detector_settings::set_is_enabled(bool enabled) QHash<QString, QString> proc_detector_settings::split_process_names() { QString str = get_game_list(); - QStringList pairs = str.split(RECORD_SEPARATOR, QString::SkipEmptyParts); + constexpr auto split_flag = +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + Qt::SkipEmptyParts; +#else + QString::SkipEmptyParts; +#endif + QStringList pairs = str.split(RECORD_SEPARATOR, split_flag); QHash<QString, QString> ret; ret.reserve(pairs.size() * 2); for (auto const& pair : pairs) diff --git a/sdk-paths-sthalik@MSVC-windows.cmake b/sdk-paths-sthalik@MSVC-windows.cmake index 2f4f4ba2..9e1e3583 100644 --- a/sdk-paths-sthalik@MSVC-windows.cmake +++ b/sdk-paths-sthalik@MSVC-windows.cmake @@ -20,10 +20,8 @@ endfunction() set(opentrack_install-debug-info TRUE CACHE INTERNAL "" FORCE) set(opentrack_maintainer-mode TRUE CACHE INTERNAL "" FORCE) -setq(Qt5_DIR "../qt-5.12.0/lib/cmake/Qt5") - setq(EIGEN3_INCLUDE_DIR "eigen") -setq(OpenCV_DIR "opencv/build") +setq(OpenCV_DIR "../opencv/build") setq(SDL2_DIR "SDL2-win32") setq(SDK_ARUCO_LIBPATH "aruco/build/src/aruco.lib") setq(SDK_FSUIPC "fsuipc") @@ -32,11 +30,11 @@ setq(SDK_KINECT20 "Kinect-v2.0") setq(SDK_LIBUSB "libusb-msvc-x86") setq(SDK_PS3EYEDRIVER "PS3EYEDriver") setq(SDK_REALSENSE "RSSDK-R3") -setq(SDK_RIFT_140 "ovr_sdk_win_1.43.0/LibOVR") +setq(SDK_RIFT_140 "ovr_sdk_win_23.0.0/LibOVR") setq(SDK_VALVE_STEAMVR "steamvr") setq(SDK_VJOYSTICK "vjoystick") -set(Qt5_DIR "c:/qt/qt-5.14.0/lib/cmake/Qt5" CACHE PATH "" FORCE) +setq(Qt5_DIR "../qt-5.15.2/lib/cmake/Qt5") set(Qt5Core_DIR "${Qt5_DIR}Core" CACHE PATH "" FORCE) set(Qt5Gui_DIR "${Qt5_DIR}Gui" CACHE PATH "" FORCE) diff --git a/tracker-easy/CMakeLists.txt b/tracker-easy/CMakeLists.txt index c377dd9c..5ba49944 100644 --- a/tracker-easy/CMakeLists.txt +++ b/tracker-easy/CMakeLists.txt @@ -15,7 +15,7 @@ if(OpenCV_FOUND) if(CMAKE_COMPILER_IS_GNUCXX) add_compile_options(-Wno-sign-compare) elseif(MSVC) - add_compile_definitions(-wd4018) + add_compile_options(-wd4018) endif() otr_module(tracker-easy) |