Commit 8a2e4314 authored by Philip Trettner's avatar Philip Trettner

Fixed legacy rift support (compile errors)

parent 4b4d3e58
...@@ -14,10 +14,11 @@ ...@@ -14,10 +14,11 @@
#include <ACGL/ACGL.hh> #include <ACGL/ACGL.hh>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <OVR_CAPI.h>
#if ACGL_RIFT_SDK_VERSION >= 32 #if ACGL_RIFT_SDK_VERSION >= 32
#include <OVR_CAPI.h>
namespace ACGL{ namespace ACGL{
namespace HardwareSupport{ namespace HardwareSupport{
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* users body to the requested eye. * users body to the requested eye.
* *
*/ */
#ifdef ACGL_USE_OCULUS_RIFT #if ACGL_RIFT_SDK_VERSION >= 32
#include <ACGL/ACGL.hh> #include <ACGL/ACGL.hh>
#include <ACGL/Scene/GenericCamera.hh> #include <ACGL/Scene/GenericCamera.hh>
...@@ -66,4 +66,4 @@ ACGL_SMARTPOINTER_TYPEDEFS(OculusRiftCamera) ...@@ -66,4 +66,4 @@ ACGL_SMARTPOINTER_TYPEDEFS(OculusRiftCamera)
} }
} }
#endif // ACGL_USE_OCULUS_RIFT #endif // ACGL_RIFT_SDK_VERSION
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
* Distributed under the terms of the MIT License (see LICENSE.TXT). * * Distributed under the terms of the MIT License (see LICENSE.TXT). *
**********************************************************************/ **********************************************************************/
#ifdef ACGL_USE_OCULUS_RIFT #if ACGL_RIFT_SDK_VERSION >= 32
#include <ACGL/Scene/OculusRiftCamera.hh> #include <ACGL/Scene/OculusRiftCamera.hh>
...@@ -141,4 +141,4 @@ glm::uvec2 OculusRiftCamera::getViewportSize() const ...@@ -141,4 +141,4 @@ glm::uvec2 OculusRiftCamera::getViewportSize() const
} }
} }
#endif // ACGL_USE_OCULUS_RIFT #endif // ACGL_RIFT_SDK_VERSION >= 32
...@@ -63,7 +63,7 @@ MemoryMappedFileWinImpl::MemoryMappedFileWinImpl( ...@@ -63,7 +63,7 @@ MemoryMappedFileWinImpl::MemoryMappedFileWinImpl(
// open the file // open the file
// //
////////////////////// //////////////////////
mFileHandle = CreateFile(_fileName, fileAccess, fileShare, mFileHandle = CreateFileA(_fileName, fileAccess, fileShare,
NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if (mFileHandle == INVALID_HANDLE_VALUE) if (mFileHandle == INVALID_HANDLE_VALUE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment