diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2013-08-07 14:59:33 +1000 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2013-08-07 14:59:33 +1000 |
| commit | 7ae5d49fc78d30c13c2c45c91cb012027c745743 (patch) | |
| tree | 5728472700be1a0d239b40c70a31963f50f9b218 | |
| parent | 1239f401726489b1bccf49107cda20a6c7af12ed (diff) | |
| parent | c78c8a3c6948cd24ecc6d4681cda1577f65edae8 (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 4fe18375..8295d062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -63,9 +63,6 @@ if(NOT SDK_FACEAPI_ONLY) SET(SDK_OPENCV_STATIC FALSE CACHE BOOL "Whether OpenCV is statically linked") if (WIN32) SET(SDK_SM_FACEAPI_PATH "" CACHE PATH "SeeingMachines FaceAPI SDK path") - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC) - set(SDK_MINGW_PATH "" CACHE PATH "MinGW path") - endif() set(SDK_SIMCONNECT "" CACHE PATH "Path to SimConnect SDK") set(SDK_DIRECTX "" CACHE PATH "Path to DirectX SDK") set(SDK_FSUIPC "" CACHE PATH "Path to FSUIPC") @@ -597,14 +594,6 @@ if(NOT SDK_FACEAPI_ONLY) endif() if(WIN32) - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUCC) - file(GLOB mingw-libgcc-s "${SDK_MINGW_PATH}/bin/libgcc_s_*.dll") - install(FILES - "${mingw-libgcc-s}" - "${SDK_MINGW_PATH}/lib32/libstdc++-6.dll" - DESTINATION . - ) - endif() install(FILES "${CMAKE_SOURCE_DIR}/bin/cleye.config" DESTINATION .) if(SDK_SIMCONNECT) install(TARGETS opentrack-proto-simconnect diff --git a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp index 84a3de73..152c1e32 100644 --- a/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp +++ b/ftnoir_tracker_aruco/ftnoir_tracker_aruco.cpp @@ -184,7 +184,7 @@ void Tracker::run() aruco::MarkerDetector detector; detector.setDesiredSpeed(3); - detector.setThresholdParams(11, 6); + detector.setThresholdParams(11, 5); cv::Mat color, grayscale, rvec, tvec; while (!stop) |