diff options
Diffstat (limited to 'tracker-hydra')
| -rw-r--r-- | tracker-hydra/CMakeLists.txt | 38 | ||||
| -rw-r--r-- | tracker-hydra/ftnoir_tracker_hydra.cpp | 5 | ||||
| -rw-r--r-- | tracker-hydra/ftnoir_tracker_hydra.h | 16 | ||||
| -rw-r--r-- | tracker-hydra/lang/zh_CN.ts | 2 |
4 files changed, 35 insertions, 26 deletions
diff --git a/tracker-hydra/CMakeLists.txt b/tracker-hydra/CMakeLists.txt index af44135f..48471765 100644 --- a/tracker-hydra/CMakeLists.txt +++ b/tracker-hydra/CMakeLists.txt @@ -1,5 +1,5 @@ set(SDK_HYDRA "" CACHE PATH "libSixense path for Razer Hydra") -if(SDK_HYDRA) +if(SDK_HYDRA AND opentrack-intel) otr_module(tracker-hydra) target_include_directories(opentrack-tracker-hydra SYSTEM PUBLIC ${SDK_HYDRA}/include ${SDK_HYDRA}/include/sixense_utils) if(opentrack-64bit) @@ -15,23 +15,29 @@ if(SDK_HYDRA) set(dir bin) set(ext dll) endif() - set(under_dll _dll) - set(soext dll) - target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/${dir}/win32/release_dll/sixense.${ext}") - install(FILES "${SDK_HYDRA}/bin/win32/release_dll/sixense.dll" DESTINATION ${opentrack-hier-pfx} PERMISSIONS ${opentrack-perms-exec}) + if (opentrack-64bit) + set(part "x64") + else() + set(part "win32") + endif() + set(lib "${SDK_HYDRA}/${dir}/${part}/release_dll/sixense${six4}.${ext}") + set(dll "${SDK_HYDRA}/bin/${part}/release_dll/sixense${six4}.dll") + install(FILES "${dll}" DESTINATION ${opentrack-libexec} PERMISSIONS ${opentrack-perms-exec}) + target_link_libraries(opentrack-tracker-hydra "${lib}") else() if(APPLE) - set(dest .) - set(under-dll _dll) - set(soext dylib) - set(plat osx) - else() - set(dest ${opentrack-hier-pfx}) - set(under-dll) - set(soext so) - set(plat linux) + set(dest ".") + set(part "release_dll") + set(soext "dylib") + set(plat "osx") + else() # assume Linux + set(dest "${opentrack-libexec}") + set(part "release") + set(soext "so") + set(plat "linux") endif() - target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/lib/${plat}${six4}/release${under-dll}/libsixense${six4}.${soext}") - install(FILES "${SDK_HYDRA}/lib/${plat}${six4}/release${under-dll}/libsixense${six4}.${soext}" DESTINATION ${opentrack-hier-pfx} PERMISSIONS ${opentrack-perms-exec}) + set(lib "libsixense${six4}.${soext}") + target_link_libraries(opentrack-tracker-hydra "${SDK_HYDRA}/lib/${plat}${six4}/${part}/${lib}") + install(FILES "${SDK_HYDRA}/lib/${plat}${six4}/${part}/${lib}" DESTINATION ${opentrack-libexec} PERMISSIONS ${opentrack-perms-exec}) endif() endif() diff --git a/tracker-hydra/ftnoir_tracker_hydra.cpp b/tracker-hydra/ftnoir_tracker_hydra.cpp index 69bb71e9..5f548bd6 100644 --- a/tracker-hydra/ftnoir_tracker_hydra.cpp +++ b/tracker-hydra/ftnoir_tracker_hydra.cpp @@ -18,12 +18,13 @@ #include <cstdio> #include <cmath> #ifdef _WIN32 +# undef WIN32 +# define WIN32 # define SIXENSE_STATIC_LIB -# define SIXENSE_UTILS_STATIC_LIB #endif #include <sixense.h> -Hydra_Tracker::Hydra_Tracker() {} +Hydra_Tracker::Hydra_Tracker() = default; #include <sixense_math.hpp> diff --git a/tracker-hydra/ftnoir_tracker_hydra.h b/tracker-hydra/ftnoir_tracker_hydra.h index 474a93f8..8af44344 100644 --- a/tracker-hydra/ftnoir_tracker_hydra.h +++ b/tracker-hydra/ftnoir_tracker_hydra.h @@ -5,7 +5,8 @@ #include "options/options.hpp" using namespace options; -struct settings : opts { +struct settings : opts +{ settings() : opts("tracker-hydra") {} @@ -15,7 +16,7 @@ class Hydra_Tracker : public ITracker { public: Hydra_Tracker(); - ~Hydra_Tracker(); + ~Hydra_Tracker() override; module_status start_tracker(QFrame *) override; void data(double *data) override; @@ -29,8 +30,8 @@ class dialog_hydra: public ITrackerDialog Q_OBJECT public: dialog_hydra(); - void register_tracker(ITracker *) {} - void unregister_tracker() {} + void register_tracker(ITracker *) override {} + void unregister_tracker() override {} private: settings s; Ui::UIHydraControls ui; @@ -41,8 +42,9 @@ private slots: class hydraDll : public Metadata { -public: - QString name() { return QString("Razer Hydra -- inertial device"); } - QIcon icon() { return QIcon(":/images/opentrack.png"); } + Q_OBJECT + + QString name() override { return QString("Razer Hydra -- inertial device"); } + QIcon icon() override { return QIcon(":/images/opentrack.png"); } }; diff --git a/tracker-hydra/lang/zh_CN.ts b/tracker-hydra/lang/zh_CN.ts index f5440284..f1257856 100644 --- a/tracker-hydra/lang/zh_CN.ts +++ b/tracker-hydra/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>UIHydraControls</name> <message> |