tracker-rs: updated RealSense SDK version to R5

7 files changed, 10 insertions, 6 deletions

diff --git a/tracker-rs/CMakeLists.txt b/tracker-rs/CMakeLists.txt
index f4f6d4b9..24dd5c74 100644
--- a/tracker-rs/CMakeLists.txt
+++ b/tracker-rs/CMakeLists.txt
@@ -1,5 +1,5 @@
 if(WIN32)
     opentrack_boilerplate(opentrack-tracker-rs)
     install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe" DESTINATION . ${opentrack-perms})
-    install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe" DESTINATION ./contrib/ ${opentrack-perms})
+    install(FILES "${CMAKE_SOURCE_DIR}/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.6161.exe" DESTINATION ./contrib/ ${opentrack-perms})
 endif()
diff --git a/tracker-rs/ftnoir_tracker_rs.cpp b/tracker-rs/ftnoir_tracker_rs.cpp
index 3e9b23c8..42224428 100644
--- a/tracker-rs/ftnoir_tracker_rs.cpp
+++ b/tracker-rs/ftnoir_tracker_rs.cpp
@@ -71,17 +71,17 @@ void RSTracker::rsImplProcessFinished(int exitCode){
         msgBox.setIcon(QMessageBox::Critical);
         msgBox.setText("RealSense Tracking Error");
         if(exitCode==-101){ //The implementation got an invalid handle from the RealSense SDK session/modules
-            msgBox.setInformativeText("Couldn't initialize RealSense tracking. Please install SDK Runtime R4.");
+            msgBox.setInformativeText("Couldn't initialize RealSense tracking. Please install SDK Runtime R5.");
         }
         else {
-            msgBox.setInformativeText("Status code: " + QString::number(exitCode) + ".\n\nNote that you need the latest camera drivers and the SDK runtime R4 to be installed.");
+            msgBox.setInformativeText("Status code: " + QString::number(exitCode) + ".\n\nNote that you need the latest camera drivers and the SDK runtime R5 to be installed.");
         }
         QPushButton* triggerSdkInstallation = msgBox.addButton("Install Runtime", QMessageBox::ActionRole);
         msgBox.addButton(QMessageBox::Ok);
         msgBox.exec();
 
         if(msgBox.clickedButton() == triggerSdkInstallation){
-            bool pStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all");
+            bool pStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_7.0.23.6161.exe --finstall=core,face3d --fnone=all");
             if(!pStarted){
                 QMessageBox::warning(0, "Intel® RealSense™ Runtime Installation", "Installation process failed to start.", QMessageBox::Ok);
             }
diff --git a/tracker-rs/ftnoir_tracker_rs_controls.cpp b/tracker-rs/ftnoir_tracker_rs_controls.cpp
index 6c71d58f..b97ab9d0 100644
--- a/tracker-rs/ftnoir_tracker_rs_controls.cpp
+++ b/tracker-rs/ftnoir_tracker_rs_controls.cpp
@@ -20,7 +20,7 @@ RSTrackerControls::RSTrackerControls()
 
 void RSTrackerControls::doInstallRSRuntime()
 {
-    bool processStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_6.0.21.6598.exe --finstall=core,face3d --fnone=all");
+    bool processStarted = QProcess::startDetached("contrib\\intel_rs_sdk_runtime_websetup_7.0.23.6161.exe --finstall=core,face3d --fnone=all");
     if(processStarted){
         this->close();
     }
diff --git a/tracker-rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe b/tracker-rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe
deleted file mode 100644
index 34ecc9df..00000000
--- a/tracker-rs/redist/intel_rs_sdk_runtime_websetup_6.0.21.6598.exe
+++ /dev/null
diff --git a/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.6161.exe b/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.6161.exe
new file mode 100644
index 00000000..2c16bd93
--- /dev/null
+++ b/tracker-rs/redist/intel_rs_sdk_runtime_websetup_7.0.23.6161.exe
diff --git a/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe b/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe
index 1e2a57f1..f7023255 100644
--- a/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe
+++ b/tracker-rs/rs_impl/bin/opentrack-tracker-rs-impl.exe
diff --git a/tracker-rs/rs_impl/build.bat b/tracker-rs/rs_impl/build.bat
index 15206431..3a44fed5 100644
--- a/tracker-rs/rs_impl/build.bat
+++ b/tracker-rs/rs_impl/build.bat
@@ -1,2 +1,6 @@
-cd "%VS120COMNTOOLS%\..\..\VC"
+IF DEFINED %VS120COMNTOOLS%] (
+	cd "%VS120COMNTOOLS%\..\..\VC"
+	) ELSE (
+	cd "%VS140COMNTOOLS%\..\..\VC"
+	)
 vcvarsall x64 && cd %~dp0 && CL /nologo /Ox /DUNICODE /D_UNICODE /MT /I"%RSSDK_DIR%\opensource\include" ftnoir_tracker_rs_impl.cpp udp_sender.cpp "%RSSDK_DIR%\opensource\src\libpxc\libpxc.cpp" /link ADVAPI32.LIB Ws2_32.lib /SUBSYSTEM:CONSOLE /OUT:bin\opentrack-tracker-rs-impl.exe 
\ No newline at end of file