aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2015-03-26 23:36:50 +0100
committerSven Gothel <[email protected]>2015-03-26 23:36:50 +0100
commitbb6a8fdc8decdbec64bbab0fe2175e76211d0e77 (patch)
tree463fd9d6b4d72decc418d408ed924cbb02315da8 /make
parent900f1f2a877aacfa750388419f05c0c13d6c5f26 (diff)
Bug 1116 - Add OculusVR DK2 Support - Part-2 (DK1 and DK2 on DK2 SDK w/ Eye Tracker if available)
Diffstat (limited to 'make')
-rw-r--r--make/config/oculusvr/oculusvr-common.cfg2
-rw-r--r--make/config/oculusvr/oculusvr.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/make/config/oculusvr/oculusvr-common.cfg b/make/config/oculusvr/oculusvr-common.cfg
index 24f535d45..c330ce5be 100644
--- a/make/config/oculusvr/oculusvr-common.cfg
+++ b/make/config/oculusvr/oculusvr-common.cfg
@@ -33,7 +33,7 @@ ReturnsString ovrHmd_GetString
ReturnsString ovrHmdDesc.ProductName
ReturnsString ovrHmdDesc.Manufacturer
ReturnsString ovrHmdDesc.DisplayDeviceName
-ReturnsString ovrSensorDesc.SerialNumber
+ReturnsString ovrHmdDesc.SerialNumber
ReturnedArrayLength ovrHmdDesc.Handle 1
ReturnedArrayLength ovrDistortionMesh.pVertexData getVertexCount()
diff --git a/make/config/oculusvr/oculusvr.c b/make/config/oculusvr/oculusvr.c
index 7486ce35d..bab34e5a9 100644
--- a/make/config/oculusvr/oculusvr.c
+++ b/make/config/oculusvr/oculusvr.c
@@ -2,4 +2,6 @@
typedef struct ovrHmdStruct {
} OvrHmdContext;
+#define OVR_ALIGNAS(n)
+
#include "OVR_CAPI.h"