diff --git a/include/ACGL/HardwareSupport/RiftSdk.hh b/include/ACGL/HardwareSupport/RiftSdk.hh index 0eefb09b2a21ccc1a9a1aba1a2b107a1aa093c2c..a31c9c1503ca164c64f8cb8f113236536bda2b77 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 fc1688fd15161fe79beeeeb9dce74b91150cfd87..56ebb3d329662fc8ff1c7fa0f60fc81b91db456f 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 a24866881f0f9fcecf39741848ec8899c5b62f34..68258317927c29e6bc5adde637c72e880d4d0cb8 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 cf46649336973302a8f9cd5293a5a336e49777e6..6988ace4219759ac833570802212ab38aebeffb2 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)