Update to OpenVR 1.0.15

r57zone · Jun 6, 2018 · d2a7993 · d2a7993
1 parent ccfa999
commit d2a7993
Show file tree

Hide file tree

Showing 12 changed files with 3,562 additions and 50 deletions.
diff --git a/OpenVR/FreeTrack/headers/openvr.h b/OpenVR/FreeTrack/headers/openvr.h
diff --git a/OpenVR/FreeTrack/headers/openvr_api.cs b/OpenVR/FreeTrack/headers/openvr_api.cs
diff --git a/OpenVR/FreeTrack/headers/openvr_api.json b/OpenVR/FreeTrack/headers/openvr_api.json
diff --git a/OpenVR/FreeTrack/headers/openvr_capi.h b/OpenVR/FreeTrack/headers/openvr_capi.h
diff --git a/OpenVR/FreeTrack/headers/openvr_driver.h b/OpenVR/FreeTrack/headers/openvr_driver.h
diff --git a/OpenVR/FreeTrack/samples/driver_sample/driverlog.cpp b/OpenVR/FreeTrack/samples/driver_sample/driverlog.cpp
@@ -7,6 +7,9 @@
 
 static vr::IVRDriverLog * s_pLogFile = NULL;
 
+#if !defined( WIN32)
+#define vsnprintf_s vsnprintf
+#endif
 
 bool InitDriverLog( vr::IVRDriverLog *pDriverLog )
 {
@@ -24,11 +27,7 @@ void CleanupDriverLog()
 static void DriverLogVarArgs( const char *pMsgFormat, va_list args )
 {
 	char buf[1024];
-#if defined( WIN32 )
-	vsprintf_s( buf, pMsgFormat, args );
-#else
-	vsnprintf( buf, sizeof(buf), pMsgFormat, args );
-#endif
+	vsnprintf_s( buf, sizeof(buf), pMsgFormat, args );
 
 	if( s_pLogFile )
 		s_pLogFile->Log( buf );