Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed definition tests for optional LibOVR

Browse source 
--HG--
branch : multipass-stereo
This commit is contained in:
Michael Witrant 2013-07-06 20:40:42 +02:00
parent a33a0e5c56
commit 293601e80e
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/nel/include/nel/3d/stereo_ovr.h
View file

@ -44,7 +44,7 @@
#ifndef NL3D_STEREO_OVR_H #ifndef NL3D_STEREO_OVR_H
#define NL3D_STEREO_OVR_H #define NL3D_STEREO_OVR_H
#ifdef WITH_LIBOVR #ifdef HAVE_LIBOVR
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
@ -169,7 +169,7 @@ private:
} /* namespace NL3D */ } /* namespace NL3D */
#endif /* WITH_LIBOVR */ #endif /* HAVE_LIBOVR */
#endif /* #ifndef NL3D_STEREO_OVR_H */ #endif /* #ifndef NL3D_STEREO_OVR_H */

6
code/nel/src/3d/stereo_display.cpp
View file

@ -75,7 +75,7 @@ const char *IStereoDisplay::getLibraryName(CStereoDeviceInfo::TStereoDeviceLibra
void IStereoDisplay::listDevices(std::vector<CStereoDeviceInfo> &devicesOut) void IStereoDisplay::listDevices(std::vector<CStereoDeviceInfo> &devicesOut)
{ {
#ifdef WITH_LIBOVR #ifdef HAVE_LIBOVR
CStereoOVR::listDevices(devicesOut); CStereoOVR::listDevices(devicesOut);
#endif #endif
#if !FINAL_VERSION #if !FINAL_VERSION
@ -90,7 +90,7 @@ IStereoDisplay *IStereoDisplay::createDevice(const CStereoDeviceInfo &deviceInfo
void IStereoDisplay::releaseUnusedLibraries() void IStereoDisplay::releaseUnusedLibraries()
{ {
#ifdef WITH_LIBOVR #ifdef HAVE_LIBOVR
if (!CStereoOVR::isLibraryInUse()) if (!CStereoOVR::isLibraryInUse())
CStereoOVR::releaseLibrary(); CStereoOVR::releaseLibrary();
#endif #endif
@ -98,7 +98,7 @@ void IStereoDisplay::releaseUnusedLibraries()
void IStereoDisplay::releaseAllLibraries() void IStereoDisplay::releaseAllLibraries()
{ {
#ifdef WITH_LIBOVR #ifdef HAVE_LIBOVR
CStereoOVR::releaseLibrary(); CStereoOVR::releaseLibrary();
#endif #endif
} }

4
code/nel/src/3d/stereo_ovr.cpp
View file

@ -41,7 +41,7 @@
* so, delete this exception statement from your version. * so, delete this exception statement from your version.
*/ */
#ifdef WITH_LIBOVR #ifdef HAVE_LIBOVR
#include <nel/misc/types_nl.h> #include <nel/misc/types_nl.h>
#include <nel/3d/stereo_ovr.h> #include <nel/3d/stereo_ovr.h>
@ -738,6 +738,6 @@ bool CStereoOVR::isDeviceCreated()
} /* namespace NL3D */ } /* namespace NL3D */
#endif /* WITH_LIBOVR */ #endif /* HAVE_LIBOVR */
/* end of file */ /* end of file */