Easy Tracker: Removing base static library.

19 files changed, 3 insertions, 59 deletions

diff --git a/tracker-easy/CMakeLists.txt b/tracker-easy/CMakeLists.txt
index faf9d2f3..229a90ae 100644
--- a/tracker-easy/CMakeLists.txt
+++ b/tracker-easy/CMakeLists.txt
@@ -1,8 +1,6 @@
 find_package(OpenCV QUIET)
 if(OpenCV_FOUND)
-    otr_module(tracker-easy-base STATIC)
+    otr_module(tracker-easy)
     target_include_directories(${self} SYSTEM PUBLIC ${OpenCV_INCLUDE_DIRS})
     target_link_libraries(${self} opencv_imgproc opencv_calib3d opentrack-cv opencv_core opentrack-video)
-    #set_property(TARGET ${self} PROPERTY OUTPUT_NAME "points-base")
 endif()
-add_subdirectory(module)
diff --git a/tracker-easy/module/camera.cpp b/tracker-easy/camera.cpp
index 25f1f8d5..25f1f8d5 100644
--- a/tracker-easy/module/camera.cpp
+++ b/tracker-easy/camera.cpp
diff --git a/tracker-easy/module/camera.h b/tracker-easy/camera.h
index 65b0e552..65b0e552 100644
--- a/tracker-easy/module/camera.h
+++ b/tracker-easy/camera.h
diff --git a/tracker-easy/module/export.hpp b/tracker-easy/export.hpp
index a733c9fe..a733c9fe 100644
--- a/tracker-easy/module/export.hpp
+++ b/tracker-easy/export.hpp
diff --git a/tracker-easy/module/frame.cpp b/tracker-easy/frame.cpp
index a045b783..a045b783 100644
--- a/tracker-easy/module/frame.cpp
+++ b/tracker-easy/frame.cpp
diff --git a/tracker-easy/module/frame.hpp b/tracker-easy/frame.hpp
index 89334599..89334599 100644
--- a/tracker-easy/module/frame.hpp
+++ b/tracker-easy/frame.hpp
diff --git a/tracker-easy/ftnoir_tracker_pt_dialog.cpp b/tracker-easy/ftnoir_tracker_pt_dialog.cpp
index f56d3014..a3fa9470 100644
--- a/tracker-easy/ftnoir_tracker_pt_dialog.cpp
+++ b/tracker-easy/ftnoir_tracker_pt_dialog.cpp
@@ -18,7 +18,7 @@
 
 using namespace options;
 
-static void init_resources() { Q_INIT_RESOURCE(tracker_pt_base); }
+static void init_resources() { Q_INIT_RESOURCE(tracker_easy); }
 
 namespace pt_impl {
 
diff --git a/tracker-easy/module/module.cpp b/tracker-easy/module.cpp
index 9aa71385..9aa71385 100644
--- a/tracker-easy/module/module.cpp
+++ b/tracker-easy/module.cpp
diff --git a/tracker-easy/module/module.hpp b/tracker-easy/module.hpp
index 0b3f12cf..0b3f12cf 100644
--- a/tracker-easy/module/module.hpp
+++ b/tracker-easy/module.hpp
diff --git a/tracker-easy/module/CMakeLists.txt b/tracker-easy/module/CMakeLists.txt
deleted file mode 100644
index e0c22f3c..00000000
--- a/tracker-easy/module/CMakeLists.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-find_package(OpenCV QUIET)
-if(OpenCV_FOUND)
-    otr_module(tracker-easy)
-    target_link_libraries(${self} opentrack-tracker-easy-base)
-    target_include_directories(${self} PUBLIC "${CMAKE_SOURCE_DIR}/tracker-easy")
-endif()
diff --git a/tracker-easy/module/Resources/Logo_IR.png b/tracker-easy/module/Resources/Logo_IR.png
deleted file mode 100644
index 95032a25..00000000
--- a/tracker-easy/module/Resources/Logo_IR.png
+++ /dev/null
diff --git a/tracker-easy/module/lang/nl_NL.ts b/tracker-easy/module/lang/nl_NL.ts
deleted file mode 100644
index e0f4dbb8..00000000
--- a/tracker-easy/module/lang/nl_NL.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="nl_NL">
-<context>
-    <name>pt_module::metadata_pt</name>
-    <message>
-        <source>Easy Tracker 0.1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tracker-easy/module/lang/ru_RU.ts b/tracker-easy/module/lang/ru_RU.ts
deleted file mode 100644
index c349c60a..00000000
--- a/tracker-easy/module/lang/ru_RU.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="ru_RU">
-<context>
-    <name>pt_module::metadata_pt</name>
-    <message>
-        <source>Easy Tracker 0.1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tracker-easy/module/lang/stub.ts b/tracker-easy/module/lang/stub.ts
deleted file mode 100644
index 678740cd..00000000
--- a/tracker-easy/module/lang/stub.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1">
-<context>
-    <name>pt_module::metadata_pt</name>
-    <message>
-        <source>Easy Tracker 0.1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tracker-easy/module/lang/zh_CN.ts b/tracker-easy/module/lang/zh_CN.ts
deleted file mode 100644
index 678740cd..00000000
--- a/tracker-easy/module/lang/zh_CN.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1">
-<context>
-    <name>pt_module::metadata_pt</name>
-    <message>
-        <source>Easy Tracker 0.1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-</TS>
diff --git a/tracker-easy/module/tracker_pt.qrc b/tracker-easy/module/tracker_pt.qrc
deleted file mode 100644
index dfeb7369..00000000
--- a/tracker-easy/module/tracker_pt.qrc
+++ /dev/null
@@ -1,5 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>Resources/Logo_IR.png</file>
-    </qresource>
-</RCC>
diff --git a/tracker-easy/module/point_extractor.cpp b/tracker-easy/point_extractor.cpp
index 0d54a66b..0d54a66b 100644
--- a/tracker-easy/module/point_extractor.cpp
+++ b/tracker-easy/point_extractor.cpp
diff --git a/tracker-easy/module/point_extractor.h b/tracker-easy/point_extractor.h
index 2af5c131..2af5c131 100644
--- a/tracker-easy/module/point_extractor.h
+++ b/tracker-easy/point_extractor.h
diff --git a/tracker-easy/tracker_pt_base.qrc b/tracker-easy/tracker_easy.qrc
index 8c270540..8be79de9 100644
--- a/tracker-easy/tracker_pt_base.qrc
+++ b/tracker-easy/tracker_easy.qrc
@@ -1,5 +1,6 @@
 <RCC>
     <qresource prefix="/">
+        <file>Resources/Logo_IR.png</file>
         <file>Resources/cap_front.png</file>
         <file>Resources/cap_side.png</file>
         <file>Resources/clip_front.png</file>