Merge branch 'unstable' into trackhat

* unstable: (140 commits)
  tracker/pt: increase auto threshold bucket size again
  tracker/pt: limit max amount of extracted blobs
  gui: don't update main window if we're minimized
  tracker/pt: only show widget if the frame is visible
  tracker/pt: don't resize twice in widget
  freetrack/games: regen
  contrib/make-csv: perl sort isn't stable, don't ignore case
  tracker/pt: avoid widget temp QImage allocation
  spline-widget: oops, pass by reference
  tracker/pt: don't allocate temporary dynamic size arrays
  tracker/pt: don't copy points array needlessly
  tracker/pt: don't allocate temporary frame
  tracker/pt: cv::Mat::at<T> is slow, use cv::Mat::ptr
  tracker/pt: avoid widget malloc when able
  tracker/pt: optimize widget
  tracker/pt: update video widget at 40 -> 50 ms
  cmake/mingw-w64: update
  tracker/pt: reduce mutex contention
  gui: fix left margin
  tracker/pt: remove krap
  tracker/pt: move ctor out of the loop
  tracker/pt: nix unused
  tracker/pt: don't fill mask on frame
  pose-widget: also bilinear interpolation of alpha value
  ui: adjust margin
  ui: make more compact
  glwidget: use transparent octopus background
  api/mat: fix typos/breakage
  api/joy: refresh only manually on certain events
  pt: histogram more granular 6 -> 8
  cmake/api: link with strmiids.lib on win32
  tracker/pt: reduce auto thresholding histogram bucket size
  api/keys: prevent idempotent keys
  api/joy: move from header
  api/joy: prevent idempotent keypressed passed to receiver
  compat/options: get rid of std::string usage
  compat/options: move from header
  gui/settings: set parent, otherwise not modal
  gui/settings: don't forget to show a modal dialog before executing
  gui/main: don't raise a new window, it's enough to set visible
  api/joy: speed up poll_axis path
  api/joy: nix static, now that we're not a singleton
  tracker/joy: adapt to non-singleton joy worker
  joystick: no longer singleton, use fake window handle
  api/keys: use a fake window for DirectInput handle
  gui/keys: allow for pausing global keystrokes for options dialog
  api/keys: nix tautological #ifdef
  contrib/aruco: oops, right extension
  contrib/aruco: use @frost555's marker image
  api/camera-names: move to compat/
  ...

2 files changed, 24 insertions, 11 deletions

diff --git a/cmake/mingw-w64.cmake b/cmake/mingw-w64.cmake
index 02ab66cb..679f67de 100644
--- a/cmake/mingw-w64.cmake
+++ b/cmake/mingw-w64.cmake
@@ -27,7 +27,7 @@ SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 
 # oldest CPU supported here is Northwood-based Pentium 4. -sh 20150811
 set(fpu "-ffast-math -fno-finite-math-only -mfpmath=both")
-set(cpu "-O3 -march=pentium4 -mtune=corei7-avx ${fpu} -msse -msse2 -mno-sse3")
+set(cpu "-O3 -march=pentium4 -mtune=corei7-avx ${fpu} -msse -msse2 -mno-sse3 -frename-registers")
 
 set(CFLAGS-OVERRIDE "" CACHE STRING "")
 
diff --git a/cmake/opentrack-macros.cmake b/cmake/opentrack-macros.cmake
index e43dc3b5..d84f9175 100644
--- a/cmake/opentrack-macros.cmake
+++ b/cmake/opentrack-macros.cmake
@@ -32,7 +32,7 @@ endfunction()
 
 macro(opentrack_library n dir)
     cmake_parse_arguments(opentrack-foolib
-        "NO-LIBRARY;STATIC;NO-COMPAT;NO-LINKER-SCRIPT"
+        "NO-LIBRARY;STATIC;NO-COMPAT;NO-LINKER-SCRIPT;LINKAGE"
         "LINK;COMPILE;GNU-LINK;GNU-COMPILE"
         ""
         ${ARGN}
@@ -53,20 +53,33 @@ macro(opentrack_library n dir)
             target_link_libraries(${n} opentrack-api opentrack-compat)
         endif()
         target_link_libraries(${n} ${MY_QT_LIBS})
-        if(CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE AND NOT opentrack-foolib_NO-LINKER-SCRIPT)
-            SET_TARGET_PROPERTIES(${n} PROPERTIES
-                LINK_FLAGS "${opentrack-foolib_LINK} ${opentrack-foolib_GNU-LINK} -Wl,--as-needed -Wl,--version-script=\"${CMAKE_SOURCE_DIR}/opentrack-compat/${version-script}-version-script.txt\""
+        if(CMAKE_COMPILER_IS_GNUCXX AND NOT opentrack-foolib_NO-LINKER-SCRIPT)
+            set(l-flags)
+            if(NOT APPLE)
+                set(l-flags "-Wl,--as-needed -Wl,--version-script=\"${CMAKE_SOURCE_DIR}/opentrack-compat/${version-script}-version-script.txt\"")
+            endif()
+            set_target_properties(${n} PROPERTIES
+                LINK_FLAGS "${opentrack-foolib_LINK} ${opentrack-foolib_GNU-LINK} ${l-flags}"
                 COMPILE_FLAGS "${opentrack-foolib_COMPILE} ${opentrack-foolib_GNU-COMPILE} -fvisibility=hidden -fvisibility-inlines-hidden"
             )
         else()
-            set(link-flags)
-            if(MSVC)
-                set(link-flags "${msvc-subsystem} /DEBUG /OPT:ICF")
+            set(c-props)
+            set(l-props)
+            if(opentrack-foolib_LINKAGE AND CMAKE_COMPILER_IS_GNUCXX AND NOT APPLE)
+                set(c-props "${opentrack-foolib_COMPILE} ${opentrack-foolib_GNU-COMPILE} -fvisibility=hidden -fvisibility-inlines-hidden")
+                set(l-props "${opentrack-foolib_LINK} ${opentrack-foolib_GNU-LINK} -Wl,--as-needed")
+            else()
+                if(MSVC)
+                    set(l-props "${msvc-subsystem} /DEBUG /OPT:ICF")
+                endif()
             endif()
-            set_target_properties(${n} PROPERTIES LINK_FLAGS "${link-flags} ${opentrack-foolib_LINK}" COMPILE_FLAGS "${opentrack-foolib_COMPILE}")
-            set(link-flags)
+            set_target_properties(${n} PROPERTIES
+                LINK_FLAGS "${l-props} ${opentrack-foolib_LINK}"
+                COMPILE_FLAGS "${c-props} ${opentrack-foolib_COMPILE}"
+            )
         endif()
-        string(REPLACE "-" "_" n_ ${n})
+        string(REGEX REPLACE "^opentrack-" "" n_ ${n})
+        string(REPLACE "-" "_" n_ ${n_})
         target_compile_definitions(${n} PRIVATE "BUILD_${n_}")
         if(NOT opentrack-foolib_STATIC)
             install(TARGETS ${n} RUNTIME DESTINATION . LIBRARY DESTINATION .)