diff --git a/client_commandline/client_commandline.vcxproj b/client_commandline/client_commandline.vcxproj
index bf776c6b..01e0edb2 100644
--- a/client_commandline/client_commandline.vcxproj
+++ b/client_commandline/client_commandline.vcxproj
@@ -89,6 +89,11 @@
$(SolutionDir)$(Configuration)\bin\$(Platform)\
$(SolutionDir)build\$(ProjectName)\$(Configuration)\$(Platform)\
+
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0\lib64-msvc-14.0
+ $(MSBuildProjectDirectory)\..\openvr
+
@@ -97,7 +102,7 @@
Disabled
WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)
Console
@@ -112,12 +117,12 @@
Disabled
_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)
Console
true
- ..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;%(AdditionalLibraryDirectories)
+ $(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);%(AdditionalLibraryDirectories)
openvr_api.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)
@@ -131,7 +136,7 @@
true
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)
Console
@@ -150,14 +155,14 @@
true
NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)
Console
true
true
true
- ..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;%(AdditionalLibraryDirectories)
+ $(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);%(AdditionalLibraryDirectories)
openvr_api.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/client_leapmotion/client_leapmotion.vcxproj b/client_leapmotion/client_leapmotion.vcxproj
index 171f3a30..78fde3d2 100644
--- a/client_leapmotion/client_leapmotion.vcxproj
+++ b/client_leapmotion/client_leapmotion.vcxproj
@@ -102,6 +102,11 @@
$(SolutionDir)$(Configuration)\bin\$(Platform)\
$(SolutionDir)build\$(ProjectName)\$(Configuration)\$(Platform)\
+
+ $(MSBuildProjectDirectory)\..\openvr
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0\lib64-msvc-14.0
+
@@ -110,7 +115,7 @@
Disabled
WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;..\third-party\LeapSDK\include;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;..\third-party\LeapSDK\include;%(AdditionalIncludeDirectories)
Console
@@ -126,12 +131,12 @@
Disabled
_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;..\third-party\LeapSDK\include;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;..\third-party\LeapSDK\include;%(AdditionalIncludeDirectories)
Console
true
- ..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;..\third-party\LeapSDK\lib\x64;%(AdditionalLibraryDirectories)
+ $(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);..\third-party\LeapSDK\lib\x64;%(AdditionalLibraryDirectories)
openvr_api.lib;Leap.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)
@@ -145,7 +150,7 @@
true
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;..\third-party\LeapSDK\include;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;..\third-party\LeapSDK\include;%(AdditionalIncludeDirectories)
Console
@@ -165,14 +170,14 @@
true
NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;..\third-party\LeapSDK\include;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;..\third-party\LeapSDK\include;%(AdditionalIncludeDirectories)
Console
true
true
true
- ..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;..\third-party\LeapSDK\lib\x64;%(AdditionalLibraryDirectories)
+ $(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);..\third-party\LeapSDK\lib\x64;%(AdditionalLibraryDirectories)
openvr_api.lib;Leap.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/client_overlay/client_overlay.vcxproj b/client_overlay/client_overlay.vcxproj
index c3f249ab..7625a4d4 100644
--- a/client_overlay/client_overlay.vcxproj
+++ b/client_overlay/client_overlay.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -44,6 +44,9 @@
+ $(MSBuildProjectDirectory)\..\openvr
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0\lib64-msvc-14.0
bin\win64\
$(Platform)\$(Configuration)\
OpenVR-InputEmulatorOverlay
@@ -56,7 +59,7 @@
- ..\lib_vrinputemulator\include;..\third-party\boost_1_63_0;..\openvr\headers;..\third-party\easylogging++;$(QTDIR)\include;$(QTDIR)\include\QtQuick;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtQml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtCore;release;$(QTDIR)\mkspecs\win32-msvc2015;$(QTDIR)\include\QtMultimedia;.\;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(BOOST_ROOT);$(OPENVR_ROOT)\headers;..\third-party\easylogging++;$(QTDIR)\include;$(QTDIR)\include\QtQuick;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtQml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtCore;release;$(QTDIR)\mkspecs\win32-msvc2015;$(QTDIR)\include\QtMultimedia;.\;%(AdditionalIncludeDirectories)
-Zc:strictStrings -Zc:throwingNew -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)
release\
false
@@ -75,8 +78,8 @@
Level3
- $(QTDIR)\lib\qtmain.lib;shell32.lib;..\openvr\lib\win64\openvr_api.lib;$(QTDIR)\lib\Qt5Quick.lib;$(QTDIR)\lib\Qt5Widgets.lib;$(QTDIR)\lib\Qt5Gui.lib;$(QTDIR)\lib\Qt5Qml.lib;$(QTDIR)\lib\Qt5Network.lib;$(QTDIR)\lib\Qt5Core.lib;Qt5Multimedia.lib;%(AdditionalDependencies)
- ..\third-party\boost_1_63_0\lib64-msvc-14.0;$(QTDIR)\lib;$(QTDIR)\lib;..\openvr\lib\win64;%(AdditionalLibraryDirectories)
+ $(QTDIR)\lib\qtmain.lib;shell32.lib;$(OPENVR_ROOT)\lib\win64\openvr_api.lib;$(QTDIR)\lib\Qt5Quick.lib;$(QTDIR)\lib\Qt5Widgets.lib;$(QTDIR)\lib\Qt5Gui.lib;$(QTDIR)\lib\Qt5Qml.lib;$(QTDIR)\lib\Qt5Network.lib;$(QTDIR)\lib\Qt5Core.lib;Qt5Multimedia.lib;%(AdditionalDependencies)
+ $(BOOST_LIB);$(QTDIR)\lib;$(QTDIR)\lib;$(OPENVR_ROOT)\lib\win64;%(AdditionalLibraryDirectories)
"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
true
false
@@ -98,7 +101,7 @@
- ..\lib_vrinputemulator\include;..\third-party\boost_1_63_0;..\openvr\headers;..\third-party\easylogging++;$(QTDIR)\include;$(QTDIR)\include\QtQuick;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtQml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtCore;debug;$(QTDIR)\mkspecs\win32-msvc2015;$(QTDIR)\include\QtMultimedia;.\;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(BOOST_ROOT);$(OPENVR_ROOT)\headers;..\third-party\easylogging++;$(QTDIR)\include;$(QTDIR)\include\QtQuick;$(QTDIR)\include\QtWidgets;$(QTDIR)\include\QtGui;$(QTDIR)\include\QtANGLE;$(QTDIR)\include\QtQml;$(QTDIR)\include\QtNetwork;$(QTDIR)\include\QtCore;debug;$(QTDIR)\mkspecs\win32-msvc2015;$(QTDIR)\include\QtMultimedia;.\;%(AdditionalIncludeDirectories)
-Zc:strictStrings -Zc:throwingNew -w34100 -w34189 -w44996 -w44456 -w44457 -w44458 %(AdditionalOptions)
debug\
false
@@ -117,8 +120,8 @@
$(IntDir)vc$(PlatformToolsetVersion).pdb
- $(QTDIR)\lib\qtmaind.lib;shell32.lib;..\openvr\lib\win64\openvr_api.lib;$(QTDIR)\lib\Qt5Quickd.lib;$(QTDIR)\lib\Qt5Widgetsd.lib;$(QTDIR)\lib\Qt5Guid.lib;$(QTDIR)\lib\Qt5Qmld.lib;$(QTDIR)\lib\Qt5Networkd.lib;$(QTDIR)\lib\Qt5Cored.lib;Qt5Multimediad.lib;%(AdditionalDependencies)
- ..\third-party\boost_1_63_0\lib64-msvc-14.0;$(QTDIR)\lib;C:\utils\postgresql\pgsql\lib;C:\utils\my_sql\my_sql\lib;$(QTDIR)\lib;..\openvr\lib\win64;%(AdditionalLibraryDirectories)
+ $(QTDIR)\lib\qtmaind.lib;shell32.lib;$(OPENVR_ROOT)\lib\win64\openvr_api.lib;$(QTDIR)\lib\Qt5Quickd.lib;$(QTDIR)\lib\Qt5Widgetsd.lib;$(QTDIR)\lib\Qt5Guid.lib;$(QTDIR)\lib\Qt5Qmld.lib;$(QTDIR)\lib\Qt5Networkd.lib;$(QTDIR)\lib\Qt5Cored.lib;Qt5Multimediad.lib;%(AdditionalDependencies)
+ $(BOOST_LIB);$(QTDIR)\lib;C:\utils\postgresql\pgsql\lib;C:\utils\my_sql\my_sql\lib;$(QTDIR)\lib;$(OPENVR_ROOT)\lib\win64;%(AdditionalLibraryDirectories)
"/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions)
true
true
@@ -170,9 +173,9 @@
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I.\..\third-party\boost_1_63_0" "-I.\..\openvr\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I$(BOOST_ROOT)" "-I.\$(OPENVR_ROOT)\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
Moc%27ing DeviceManipulationTabController.h...
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I.\..\third-party\boost_1_63_0" "-I.\..\openvr\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I$(BOOST_ROOT)" "-I.\$(OPENVR_ROOT)\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
Moc%27ing DeviceManipulationTabController.h...
$(ConfigurationName)\moc_%(Filename).cpp
$(ConfigurationName)\moc_%(Filename).cpp
@@ -183,27 +186,27 @@
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing DigitalInputRemappingController.h...
$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I.\..\third-party\boost_1_63_0" "-I.\..\openvr\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I$(BOOST_ROOT)" "-I.\$(OPENVR_ROOT)\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing DigitalInputRemappingController.h...
$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I.\..\third-party\boost_1_63_0" "-I.\..\openvr\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I$(BOOST_ROOT)" "-I.\$(OPENVR_ROOT)\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing AnalogInputRemappingController.h...
$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I.\..\third-party\boost_1_63_0" "-I.\..\openvr\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I$(BOOST_ROOT)" "-I.\$(OPENVR_ROOT)\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
$(QTDIR)\bin\moc.exe;%(FullPath)
Moc%27ing AnalogInputRemappingController.h...
$(ConfigurationName)\moc_%(Filename).cpp
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I.\..\third-party\boost_1_63_0" "-I.\..\openvr\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I$(BOOST_ROOT)" "-I.\$(OPENVR_ROOT)\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I.\..\third-party\boost_1_63_0" "-I.\..\openvr\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_NO_DEBUG -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DNDEBUG -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I$(BOOST_ROOT)" "-I.\$(OPENVR_ROOT)\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
Moc%27ing overlaycontroller.h...
- "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I.\..\third-party\boost_1_63_0" "-I.\..\openvr\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
+ "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o "$(ConfigurationName)\moc_%(Filename).cpp" -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DQT_QUICK_LIB -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_QML_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_MULTIMEDIA_LIB "-I.\..\lib_vrinputemulator\include" "-I$(BOOST_ROOT)" "-I.\$(OPENVR_ROOT)\headers" "-I.\..\third-party\easylogging++" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtQuick" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtQml" "-I$(QTDIR)\include\QtNetwork" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I$(QTDIR)\include\QtMultimedia" "-I."
Moc%27ing overlaycontroller.h...
$(ConfigurationName)\moc_%(Filename).cpp
$(ConfigurationName)\moc_%(Filename).cpp
@@ -226,4 +229,4 @@
-
\ No newline at end of file
+
diff --git a/driver_vrinputemulator/driver_vrinputemulator.vcxproj b/driver_vrinputemulator/driver_vrinputemulator.vcxproj
index dddd7177..e5ac1293 100644
--- a/driver_vrinputemulator/driver_vrinputemulator.vcxproj
+++ b/driver_vrinputemulator/driver_vrinputemulator.vcxproj
@@ -90,6 +90,11 @@
true
Unicode
+
+ $(MSBuildProjectDirectory)\..\openvr
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0\lib64-msvc-14.0
+
@@ -140,7 +145,7 @@
Disabled
WIN32;_DEBUG;_WINDOWS;_USRDLL;DRIVER_VRINPUTEMULATOR_EXPORTS;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;..\third-party\MinHook\include;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;..\third-party\MinHook\include;%(AdditionalIncludeDirectories)
-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)
@@ -156,13 +161,13 @@
Disabled
_DEBUG;_WINDOWS;_USRDLL;DRIVER_VRINPUTEMULATOR_EXPORTS;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;..\third-party\MinHook\include;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;..\third-party\MinHook\include;%(AdditionalIncludeDirectories)
-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)
Windows
true
- ..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;..\third-party\MinHook\lib;%(AdditionalLibraryDirectories)
+ $(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);..\third-party\MinHook\lib;%(AdditionalLibraryDirectories)
libMinHook-x64-v141-mtd.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;Winmm.lib;%(AdditionalDependencies)
@@ -176,7 +181,7 @@
true
WIN32;NDEBUG;_WINDOWS;_USRDLL;DRIVER_VRINPUTEMULATOR_EXPORTS;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;..\third-party\MinHook\include;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;..\third-party\MinHook\include;%(AdditionalIncludeDirectories)
Windows
@@ -195,14 +200,14 @@
true
NDEBUG;_WINDOWS;_USRDLL;DRIVER_VRINPUTEMULATOR_EXPORTS;%(PreprocessorDefinitions)
true
- ..\lib_vrinputemulator\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;..\third-party\MinHook\include;%(AdditionalIncludeDirectories)
+ ..\lib_vrinputemulator\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;..\third-party\MinHook\include;%(AdditionalIncludeDirectories)
Windows
true
true
true
- ..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;..\third-party\MinHook\lib;%(AdditionalLibraryDirectories)
+ $(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);..\third-party\MinHook\lib;%(AdditionalLibraryDirectories)
libMinHook-x64-v141-mtd.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;Winmm.lib;%(AdditionalDependencies)
diff --git a/driver_vrinputemulator/src/com/shm/driver_ipc_shm.cpp b/driver_vrinputemulator/src/com/shm/driver_ipc_shm.cpp
index 8f5d6164..2f116def 100644
--- a/driver_vrinputemulator/src/com/shm/driver_ipc_shm.cpp
+++ b/driver_vrinputemulator/src/com/shm/driver_ipc_shm.cpp
@@ -56,7 +56,7 @@ void IpcShmCommunicator::_ipcThreadFunc(IpcShmCommunicator* _this, ServerDriver
while (!_this->_ipcThreadStopFlag) {
try {
ipc::Request message;
- uint64_t recv_size;
+ size_t recv_size;
unsigned priority;
boost::posix_time::ptime timeout = boost::posix_time::microsec_clock::universal_time() + boost::posix_time::milliseconds(50);
if (messageQueue.timed_receive(&message, sizeof(ipc::Request), recv_size, priority, timeout)) {
diff --git a/lib_vrinputemulator/lib_vrinputemulator.vcxproj b/lib_vrinputemulator/lib_vrinputemulator.vcxproj
index 33b8011a..47e7958e 100644
--- a/lib_vrinputemulator/lib_vrinputemulator.vcxproj
+++ b/lib_vrinputemulator/lib_vrinputemulator.vcxproj
@@ -89,6 +89,11 @@
$(SolutionDir)build\$(ProjectName)\$(Configuration)\$(Platform)\
libvrinputemulator
+
+ $(MSBuildProjectDirectory)\..\openvr
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0
+ $(MSBuildProjectDirectory)\..\third-party\boost_1_63_0\lib64-msvc-14.0
+
@@ -97,7 +102,7 @@
Disabled
WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)
true
- .\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)
+ .\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)
-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)
@@ -112,14 +117,14 @@
Disabled
_DEBUG;_LIB;%(PreprocessorDefinitions)
true
- .\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)
+ .\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)
-D_SCL_SECURE_NO_WARNINGS %(AdditionalOptions)
Windows
- ..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;%(AdditionalLibraryDirectories)
+ $(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);%(AdditionalLibraryDirectories)
@@ -132,7 +137,7 @@
true
WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)
true
- .\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)
+ .\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)
Windows
@@ -150,7 +155,7 @@
true
NDEBUG;_LIB;%(PreprocessorDefinitions)
true
- .\include;..\openvr\headers;..\third-party\boost_1_63_0;..\third-party\easylogging++;%(AdditionalIncludeDirectories)
+ .\include;$(OPENVR_ROOT)\headers;$(BOOST_ROOT);..\third-party\easylogging++;%(AdditionalIncludeDirectories)
Windows
@@ -158,7 +163,7 @@
true
- ..\openvr\lib\win64;..\third-party\boost_1_63_0\lib64-msvc-14.0;%(AdditionalLibraryDirectories)
+ $(OPENVR_ROOT)\lib\win64;$(BOOST_LIB);%(AdditionalLibraryDirectories)
@@ -175,4 +180,4 @@
-
\ No newline at end of file
+
diff --git a/lib_vrinputemulator/src/vrinputemulator.cpp b/lib_vrinputemulator/src/vrinputemulator.cpp
index f8d6852d..b69aadef 100644
--- a/lib_vrinputemulator/src/vrinputemulator.cpp
+++ b/lib_vrinputemulator/src/vrinputemulator.cpp
@@ -23,7 +23,7 @@ void VRInputEmulator::_ipcThreadFunc(VRInputEmulator * _this) {
while (!_this->_ipcThreadStop) {
try {
ipc::Reply message;
- uint64_t recv_size;
+ size_t recv_size;
unsigned priority;
boost::posix_time::ptime timeout = boost::posix_time::microsec_clock::universal_time() + boost::posix_time::milliseconds(50);
if (_this->_ipcClientQueue->timed_receive(&message, sizeof(ipc::Reply), recv_size, priority, timeout)) {