Fixing plugin construction after removing OVR dependency from interface

interface/src/DisplayPlugins.cpp

@@ -16,11 +16,9 @@
 #include <display-plugins/stereo/InterleavedStereoDisplayPlugin.h>
 #include <display-plugins/Basic2DWindowOpenGLDisplayPlugin.h>
 
-#include <display-plugins/oculus/Oculus_0_6_DisplayPlugin.h>
-#include <display-plugins/oculus/Oculus_0_5_DisplayPlugin.h>
-
 #include <display-plugins/openvr/OpenVrDisplayPlugin.h>
 
+extern DisplayPlugin* makeOculusDisplayPlugin();
 
 static void addDisplayPluginToMenu(DisplayPluginPointer displayPlugin, bool active = false) {
     auto menu = Menu::getInstance();
@@ -55,13 +53,10 @@ const DisplayPluginList& getDisplayPlugins() {
             new NullDisplayPlugin(),
 #endif
             // FIXME fix stereo display plugins
-//            new SideBySideStereoDisplayPlugin(),
-//            new InterleavedStereoDisplayPlugin(),
-#if (OVR_MAJOR_VERSION == 5)
-            new Oculus_0_5_DisplayPlugin(),
-#else
-            new Oculus_0_6_DisplayPlugin(),
-#endif
+            //new SideBySideStereoDisplayPlugin(),
+            //new InterleavedStereoDisplayPlugin(),
+
+            makeOculusDisplayPlugin(),  
 
 #ifdef Q_OS_WIN
             new OpenVrDisplayPlugin(),

libraries/display-plugins/src/display-plugins/oculus/Oculus_0_5_DisplayPlugin.cpp

@@ -30,6 +30,10 @@
 #include "plugins/PluginContainer.h"
 #include "OculusHelpers.h"
 
+DisplayPlugin* makeOculusDisplayPlugin() {
+    return new Oculus_0_5_DisplayPlugin();
+}
+
 using namespace oglplus;
 
 const QString Oculus_0_5_DisplayPlugin::NAME("Oculus Rift (0.5)");

libraries/display-plugins/src/display-plugins/oculus/Oculus_0_6_DisplayPlugin.cpp

@@ -32,6 +32,9 @@
 
 #include <OglplusHelpers.h>
 
+DisplayPlugin* makeOculusDisplayPlugin() {
+    return new Oculus_0_6_DisplayPlugin();
+}
 
 // A base class for FBO wrappers that need to use the Oculus C
 // API to manage textures via ovrHmd_CreateSwapTextureSetGL,