From 9bcab9fb4274c6e1aa1a2621dbfedf829e7fcfc5 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Tue, 29 Mar 2022 00:01:31 +0200
Subject: fix i18n generation

---
 tracker-neuralnet/lang/zh_CN.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tracker-neuralnet')

diff --git a/tracker-neuralnet/lang/zh_CN.ts b/tracker-neuralnet/lang/zh_CN.ts
index 2d0dd8ffa..655d21185 100644
--- a/tracker-neuralnet/lang/zh_CN.ts
+++ b/tracker-neuralnet/lang/zh_CN.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.1" language="zh_CN">
 <context>
     <name>Form</name>
     <message>
-- 
cgit v1.2.3


From fd38b6eefeaee5c1a2643161421beade9ba0eaab Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 23 Apr 2022 15:32:46 +0200
Subject: tracker/neuralnet: add libomp redistributable for msvc

Issue: #1394
---
 tracker-neuralnet/CMakeLists.txt      |   3 +++
 tracker-neuralnet/redist/vcomp140.dll | Bin 0 -> 151976 bytes
 2 files changed, 3 insertions(+)
 create mode 100644 tracker-neuralnet/redist/vcomp140.dll

(limited to 'tracker-neuralnet')

diff --git a/tracker-neuralnet/CMakeLists.txt b/tracker-neuralnet/CMakeLists.txt
index 3623808a7..01fc9976c 100644
--- a/tracker-neuralnet/CMakeLists.txt
+++ b/tracker-neuralnet/CMakeLists.txt
@@ -29,4 +29,7 @@ if(OpenCV_FOUND AND ONNXRuntime_FOUND AND OpenMP_FOUND)
         )
 
     otr_install_lib("${ONNXRuntime_RUNTIME}" ".")
+    if(MSVC)
+        otr_install_lib("redist/vcomp140.dll" "${opentrack-bin}")
+    endif()
 endif()
diff --git a/tracker-neuralnet/redist/vcomp140.dll b/tracker-neuralnet/redist/vcomp140.dll
new file mode 100644
index 000000000..42c069b97
Binary files /dev/null and b/tracker-neuralnet/redist/vcomp140.dll differ
-- 
cgit v1.2.3


From f6e5dc41dfac32e85619de60c2683b3804df2077 Mon Sep 17 00:00:00 2001
From: Stanislaw Halik <sthalik@misaki.pl>
Date: Sat, 23 Apr 2022 15:53:35 +0200
Subject: tracker/nn: only install shared library on win32

---
 tracker-neuralnet/CMakeLists.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'tracker-neuralnet')

diff --git a/tracker-neuralnet/CMakeLists.txt b/tracker-neuralnet/CMakeLists.txt
index 01fc9976c..f414c9209 100644
--- a/tracker-neuralnet/CMakeLists.txt
+++ b/tracker-neuralnet/CMakeLists.txt
@@ -28,7 +28,9 @@ if(OpenCV_FOUND AND ONNXRuntime_FOUND AND OpenMP_FOUND)
         PERMISSIONS ${opentrack-perms-file}
         )
 
-    otr_install_lib("${ONNXRuntime_RUNTIME}" ".")
+    if(WIN32)
+        otr_install_lib("${ONNXRuntime_RUNTIME}" ".")
+    endif()
     if(MSVC)
         otr_install_lib("redist/vcomp140.dll" "${opentrack-bin}")
     endif()
-- 
cgit v1.2.3