Fixed definition tests for optional LibOVR
--HG-- branch : multipass-stereo
This commit is contained in:
parent
a33a0e5c56
commit
293601e80e
3 changed files with 7 additions and 7 deletions
|
@ -44,7 +44,7 @@
|
|||
#ifndef NL3D_STEREO_OVR_H
|
||||
#define NL3D_STEREO_OVR_H
|
||||
|
||||
#ifdef WITH_LIBOVR
|
||||
#ifdef HAVE_LIBOVR
|
||||
|
||||
#include <nel/misc/types_nl.h>
|
||||
|
||||
|
@ -169,7 +169,7 @@ private:
|
|||
|
||||
} /* namespace NL3D */
|
||||
|
||||
#endif /* WITH_LIBOVR */
|
||||
#endif /* HAVE_LIBOVR */
|
||||
|
||||
#endif /* #ifndef NL3D_STEREO_OVR_H */
|
||||
|
||||
|
|
|
@ -75,7 +75,7 @@ const char *IStereoDisplay::getLibraryName(CStereoDeviceInfo::TStereoDeviceLibra
|
|||
|
||||
void IStereoDisplay::listDevices(std::vector<CStereoDeviceInfo> &devicesOut)
|
||||
{
|
||||
#ifdef WITH_LIBOVR
|
||||
#ifdef HAVE_LIBOVR
|
||||
CStereoOVR::listDevices(devicesOut);
|
||||
#endif
|
||||
#if !FINAL_VERSION
|
||||
|
@ -90,7 +90,7 @@ IStereoDisplay *IStereoDisplay::createDevice(const CStereoDeviceInfo &deviceInfo
|
|||
|
||||
void IStereoDisplay::releaseUnusedLibraries()
|
||||
{
|
||||
#ifdef WITH_LIBOVR
|
||||
#ifdef HAVE_LIBOVR
|
||||
if (!CStereoOVR::isLibraryInUse())
|
||||
CStereoOVR::releaseLibrary();
|
||||
#endif
|
||||
|
@ -98,7 +98,7 @@ void IStereoDisplay::releaseUnusedLibraries()
|
|||
|
||||
void IStereoDisplay::releaseAllLibraries()
|
||||
{
|
||||
#ifdef WITH_LIBOVR
|
||||
#ifdef HAVE_LIBOVR
|
||||
CStereoOVR::releaseLibrary();
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -41,7 +41,7 @@
|
|||
* so, delete this exception statement from your version.
|
||||
*/
|
||||
|
||||
#ifdef WITH_LIBOVR
|
||||
#ifdef HAVE_LIBOVR
|
||||
|
||||
#include <nel/misc/types_nl.h>
|
||||
#include <nel/3d/stereo_ovr.h>
|
||||
|
@ -738,6 +738,6 @@ bool CStereoOVR::isDeviceCreated()
|
|||
|
||||
} /* namespace NL3D */
|
||||
|
||||
#endif /* WITH_LIBOVR */
|
||||
#endif /* HAVE_LIBOVR */
|
||||
|
||||
/* end of file */
|
||||
|
|
Loading…
Reference in a new issue