From 8a2e431453ed2d1822461bb904b476deb6412be9 Mon Sep 17 00:00:00 2001 From: Philip Trettner Date: Thu, 3 Jul 2014 08:30:05 +0200 Subject: [PATCH] Fixed legacy rift support (compile errors) --- include/ACGL/HardwareSupport/RiftSdk.hh | 3 ++- include/ACGL/Scene/OculusRiftCamera.hh | 4 ++-- src/ACGL/Scene/OculusRiftCamera.cc | 4 ++-- src/ACGL/Utils/MemoryMappedFileWinImpl.cc | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/include/ACGL/HardwareSupport/RiftSdk.hh b/include/ACGL/HardwareSupport/RiftSdk.hh index 0eefb09..a31c9c1 100644 --- a/include/ACGL/HardwareSupport/RiftSdk.hh +++ b/include/ACGL/HardwareSupport/RiftSdk.hh @@ -14,10 +14,11 @@ #include #include -#include #if ACGL_RIFT_SDK_VERSION >= 32 +#include + namespace ACGL{ namespace HardwareSupport{ diff --git a/include/ACGL/Scene/OculusRiftCamera.hh b/include/ACGL/Scene/OculusRiftCamera.hh index fc1688f..56ebb3d 100644 --- a/include/ACGL/Scene/OculusRiftCamera.hh +++ b/include/ACGL/Scene/OculusRiftCamera.hh @@ -16,7 +16,7 @@ * users body to the requested eye. * */ -#ifdef ACGL_USE_OCULUS_RIFT +#if ACGL_RIFT_SDK_VERSION >= 32 #include #include @@ -66,4 +66,4 @@ ACGL_SMARTPOINTER_TYPEDEFS(OculusRiftCamera) } } -#endif // ACGL_USE_OCULUS_RIFT +#endif // ACGL_RIFT_SDK_VERSION diff --git a/src/ACGL/Scene/OculusRiftCamera.cc b/src/ACGL/Scene/OculusRiftCamera.cc index a248668..6825831 100644 --- a/src/ACGL/Scene/OculusRiftCamera.cc +++ b/src/ACGL/Scene/OculusRiftCamera.cc @@ -4,7 +4,7 @@ * Distributed under the terms of the MIT License (see LICENSE.TXT). * **********************************************************************/ -#ifdef ACGL_USE_OCULUS_RIFT +#if ACGL_RIFT_SDK_VERSION >= 32 #include @@ -141,4 +141,4 @@ glm::uvec2 OculusRiftCamera::getViewportSize() const } } -#endif // ACGL_USE_OCULUS_RIFT +#endif // ACGL_RIFT_SDK_VERSION >= 32 diff --git a/src/ACGL/Utils/MemoryMappedFileWinImpl.cc b/src/ACGL/Utils/MemoryMappedFileWinImpl.cc index cf46649..6988ace 100644 --- a/src/ACGL/Utils/MemoryMappedFileWinImpl.cc +++ b/src/ACGL/Utils/MemoryMappedFileWinImpl.cc @@ -63,7 +63,7 @@ MemoryMappedFileWinImpl::MemoryMappedFileWinImpl( // open the file // ////////////////////// - mFileHandle = CreateFile(_fileName, fileAccess, fileShare, + mFileHandle = CreateFileA(_fileName, fileAccess, fileShare, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); if (mFileHandle == INVALID_HANDLE_VALUE) -- GitLab