diff --git a/OpenVR-SpaceCalibrator/Configuration.cpp b/OpenVR-SpaceCalibrator/Configuration.cpp
index 1d27fdb..5dfc491 100644
--- a/OpenVR-SpaceCalibrator/Configuration.cpp
+++ b/OpenVR-SpaceCalibrator/Configuration.cpp
@@ -202,6 +202,7 @@ void LoadProfile(CalibrationContext &ctx)
if (str == "")
{
std::cout << "Profile is empty" << std::endl;
+ ctx.Clear();
return;
}
diff --git a/OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.vcxproj b/OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.vcxproj
index 223af8a..4952d61 100644
--- a/OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.vcxproj
+++ b/OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.vcxproj
@@ -85,6 +85,7 @@
+
diff --git a/OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.vcxproj.filters b/OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.vcxproj.filters
index 4b8baa9..0382d6d 100644
--- a/OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.vcxproj.filters
+++ b/OpenVR-SpaceCalibrator/OpenVR-SpaceCalibrator.vcxproj.filters
@@ -42,6 +42,9 @@
Header Files
+
+ Header Files
+
diff --git a/OpenVR-SpaceCalibrator/UserInterface.cpp b/OpenVR-SpaceCalibrator/UserInterface.cpp
index 8676673..fb507a9 100644
--- a/OpenVR-SpaceCalibrator/UserInterface.cpp
+++ b/OpenVR-SpaceCalibrator/UserInterface.cpp
@@ -2,6 +2,7 @@
#include "UserInterface.h"
#include "Calibration.h"
#include "Configuration.h"
+#include "../Version.h"
#include
#include
@@ -9,8 +10,6 @@
#include
#include
-#define VERSION_STRING "1.2"
-
struct VRDevice
{
int id = -1;
@@ -173,7 +172,7 @@ void BuildMenu(bool runningInOverlay)
ImGui::SetNextWindowPos(ImVec2(10.0f, ImGui::GetWindowHeight() - ImGui::GetItemsLineHeightWithSpacing()));
ImGui::BeginChild("bottom line", ImVec2(ImGui::GetWindowWidth() - 20.0f, ImGui::GetItemsLineHeightWithSpacing() * 2), false);
- ImGui::Text("OpenVR Space Calibrator v" VERSION_STRING " - by tach/pushrax");
+ ImGui::Text("OpenVR Space Calibrator v" SPACECAL_VERSION_STRING " - by tach/pushrax");
if (runningInOverlay)
{
ImGui::SameLine();
diff --git a/OpenVR-SpaceCalibratorDriver/OpenVR-SpaceCalibratorDriver.vcxproj b/OpenVR-SpaceCalibratorDriver/OpenVR-SpaceCalibratorDriver.vcxproj
index 303e1c2..4d0c1cc 100644
--- a/OpenVR-SpaceCalibratorDriver/OpenVR-SpaceCalibratorDriver.vcxproj
+++ b/OpenVR-SpaceCalibratorDriver/OpenVR-SpaceCalibratorDriver.vcxproj
@@ -85,7 +85,7 @@
true
true
..\lib\MinHook\lib;%(AdditionalLibraryDirectories)
- MinHook.x64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
+ libMinHook-x64-v141-md.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
diff --git a/OpenVR-SpaceCalibratorDriver/dllmain.cpp b/OpenVR-SpaceCalibratorDriver/dllmain.cpp
index 459dbfc..21ccf7c 100644
--- a/OpenVR-SpaceCalibratorDriver/dllmain.cpp
+++ b/OpenVR-SpaceCalibratorDriver/dllmain.cpp
@@ -1,4 +1,5 @@
#include "Logging.h"
+#include "../Version.h"
#define WIN32_LEAN_AND_MEAN
#include
@@ -10,7 +11,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
{
case DLL_PROCESS_ATTACH:
OpenLogFile();
- LOG("OpenVR-SpaceCalibratorDriver loaded");
+ LOG("OpenVR-SpaceCalibratorDriver " SPACECAL_VERSION_STRING " loaded");
break;
case DLL_PROCESS_DETACH:
LOG("OpenVR-SpaceCalibratorDriver unloaded");
diff --git a/README.md b/README.md
index e1fbce6..5b4b1f3 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,7 @@ You can calibrate without using the dashboard overlay by unminimizing Space Cali
### Compiling your own build
-Open `OpenVR-SpaceCalibrator.sln` in Visual Studio 2015 and build. There are no external dependencies.
+Open `OpenVR-SpaceCalibrator.sln` in Visual Studio 2017 and build. There are no external dependencies.
### The math
diff --git a/Version.h b/Version.h
new file mode 100644
index 0000000..e713298
--- /dev/null
+++ b/Version.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define SPACECAL_VERSION_STRING "1.3"
\ No newline at end of file
diff --git a/install/installer.nsi b/install/installer.nsi
index fc4ee98..535e3fa 100644
--- a/install/installer.nsi
+++ b/install/installer.nsi
@@ -98,7 +98,7 @@ Section "Install" SecInstall
File "..\LICENSE"
File "..\x64\Release\OpenVR-SpaceCalibrator.exe"
- File "..\x64\Release\openvr_api.dll"
+ File "..\lib\openvr\lib\win64\openvr_api.dll"
File "..\OpenVR-SpaceCalibrator\manifest.vrmanifest"
File "..\OpenVR-SpaceCalibrator\icon.png"
diff --git a/lib/MinHook/lib/MinHook.x64.lib b/lib/MinHook/lib/MinHook.x64.lib
deleted file mode 100644
index 909fe68..0000000
Binary files a/lib/MinHook/lib/MinHook.x64.lib and /dev/null differ
diff --git a/lib/MinHook/lib/libMinHook-x64-v141-md.lib b/lib/MinHook/lib/libMinHook-x64-v141-md.lib
new file mode 100644
index 0000000..9ab1c7e
Binary files /dev/null and b/lib/MinHook/lib/libMinHook-x64-v141-md.lib differ
diff --git a/lib/openvr/lib/win64/openvr_api.dll b/lib/openvr/lib/win64/openvr_api.dll
new file mode 100644
index 0000000..a4ad764
Binary files /dev/null and b/lib/openvr/lib/win64/openvr_api.dll differ