Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1

Conflicts:
	LibOVR/Include/OVR_CAPI_0_5_0.h
	LibOVR/Src/CAPI/CAPI_HMDState.cpp
	LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
	LibOVR/Src/Kernel/OVR_System.cpp
	LibOVR/Src/OVR_CAPI.cpp
	LibOVR/Src/OVR_Profile.cpp
	LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
	LibOVRKernel/Src/Kernel/OVR_Types.h

1 files changed, 47 insertions, 8 deletions

diff --git a/LibOVR/Include/OVR_Version.h b/LibOVR/Include/OVR_Version.h
index 2ba20bc..c33fa3c 100644..100755
--- a/LibOVR/Include/OVR_Version.h
+++ b/LibOVR/Include/OVR_Version.h
@@ -22,14 +22,53 @@ limitations under the License.
 
 *************************************************************************************/
 
-#ifndef _OVR_VERSION_H
-#define _OVR_VERSION_H
+#ifndef OVR_Version_h
+#define OVR_Version_h
 
-#define OVR_MAJOR_VERSION 0
-#define OVR_MINOR_VERSION 4
-#define OVR_BUILD_VERSION 4
-#define OVR_VERSION_STRING "0.4.4"
 
-#define OVR_DK2_LATEST_FIRMWARE_MAJOR_VERSION 2
-#define OVR_DK2_LATEST_FIRMWARE_MINOR_VERSION 12
+
+
+
+#if !defined(OVR_STRINGIZE)
+    #define OVR_STRINGIZEIMPL(x) #x
+    #define OVR_STRINGIZE(x)     OVR_STRINGIZEIMPL(x)
 #endif
+
+// We are on major version 5 of the beta pre-release SDK. At some point we will
+// transition to product version 1 and reset the major version back to 1 (first 
+// product release, version 1.0).
+#define OVR_PRODUCT_VERSION 0
+#define OVR_MAJOR_VERSION   5
+#define OVR_MINOR_VERSION   0
+#define OVR_PATCH_VERSION   1
+#define OVR_BUILD_NUMBER    0
+
+// "Product.Major.Minor.Patch"
+#if !defined(OVR_VERSION_STRING)
+    #define OVR_VERSION_STRING  OVR_STRINGIZE(OVR_PRODUCT_VERSION.OVR_MAJOR_VERSION.OVR_MINOR_VERSION.OVR_PATCH_VERSION)
+#endif
+
+// "Product.Major.Minor.Patch.Build"
+#if !defined(OVR_DETAILED_VERSION_STRING)
+    #define OVR_DETAILED_VERSION_STRING OVR_STRINGIZE(OVR_PRODUCT_VERSION.OVR_MAJOR_VERSION.OVR_MINOR_VERSION.OVR_PATCH_VERSION.OVR_BUILD_NUMBER)
+#endif
+
+// This is the firmware version for the DK2 headset sensor board.
+//#if !defined(OVR_DK2_LATEST_FIRMWARE_MAJOR_VERSION)
+    #define OVR_DK2_LATEST_FIRMWARE_MAJOR_VERSION 2
+    #define OVR_DK2_LATEST_FIRMWARE_MINOR_VERSION 12
+//#endif
+
+// LibOVRRT description
+// This appears in the user-visible file properties. It is intended to convey publicly available additional information
+// such as feature builds.
+#if !defined(OVR_FILE_DESCRIPTION_STRING)
+    #if defined(_DEBUG)
+        #define OVR_FILE_DESCRIPTION_STRING "LibOVRRT (debug)"
+    #else
+        #define OVR_FILE_DESCRIPTION_STRING "LibOVRRT"
+    #endif
+#endif
+
+
+#endif // OVR_Version_h