Showing the changes to interface/src/DisplayPlugins.cpp (1 of 5 files). Show all
Unified · Split
| @@ -16,11 +16,10 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <display-plugins/stereo/InterleavedStereoDisplayPlugin.h> |
| 17 | 17 | #include <display-plugins/Basic2DWindowOpenGLDisplayPlugin.h> |
| 18 | 18 | |
| 19 | −#ifdef Q_OS_WIN | |
| 20 | 19 | #include <display-plugins/oculus/Oculus_0_6_DisplayPlugin.h> |
| 21 | −#else | |
| 22 | 20 | #include <display-plugins/oculus/Oculus_0_5_DisplayPlugin.h> |
| 23 | −#endif | |
| 21 | + | |
| 22 | + | |
| 24 | 23 | |
| 25 | 24 | #include <display-plugins/openvr/OpenVrDisplayPlugin.h> |
| 26 | 25 | |
| @@ -57,10 +56,10 @@ const DisplayPluginList& getDisplayPlugins() { · 30 unmodified lines | ||
| 57 | 56 | new NullDisplayPlugin(), |
| 58 | 57 | new SideBySideStereoDisplayPlugin(), |
| 59 | 58 | // new InterleavedStereoDisplayPlugin(), |
| 60 | −#ifdef Q_OS_WIN | |
| 61 | − new Oculus_0_6_DisplayPlugin(), | |
| 62 | −#else | |
| 59 | +#if (OVR_MAJOR_VERSION == 5) | |
| 63 | 60 | new Oculus_0_5_DisplayPlugin(), |
| 61 | +#else | |
| 62 | + new Oculus_0_6_DisplayPlugin(), | |
| 64 | 63 | #endif |
| 65 | 64 | |
| 66 | 65 | #ifndef Q_OS_MAC |