diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 2862891567..b93246ff6f 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -168,7 +168,7 @@ if (WIN32) endif() if (NOT ANDROID) - set(${NON_ANDROID_LIBRARIES} controllers ui-plugins display-plugins input-plugins steamworks-wrapper) + set(${NON_ANDROID_LIBRARIES} steamworks-wrapper) endif () # link required hifi libraries @@ -178,6 +178,7 @@ link_hifi_libraries( audio audio-client animation script-engine physics render-utils entities-renderer ui auto-updater controllers plugins + ui-plugins display-plugins input-plugins ${NON_ANDROID_LIBRARIES} ) diff --git a/libraries/plugins/src/plugins/PluginManager.cpp b/libraries/plugins/src/plugins/PluginManager.cpp index 0b4afe1be0..0ff68655bb 100644 --- a/libraries/plugins/src/plugins/PluginManager.cpp +++ b/libraries/plugins/src/plugins/PluginManager.cpp @@ -115,6 +115,8 @@ const LoaderList& getLoadedPlugins() { PluginManager::PluginManager() { } +#ifndef Q_OS_ANDROID + // TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class extern DisplayPluginList getDisplayPlugins(); extern InputPluginList getInputPlugins(); @@ -137,6 +139,7 @@ const DisplayPluginList& PluginManager::getDisplayPlugins() { // Grab the built in plugins displayPlugins = ::getDisplayPlugins(); + // Now grab the dynamic plugins for (auto loader : getLoadedPlugins()) { DisplayProvider* displayProvider = qobject_cast(loader->instance()); @@ -270,3 +273,5 @@ void PluginManager::disableInputs(const QStringList& inputs) { void PluginManager::saveSettings() { saveInputPluginSettings(getInputPlugins()); } + +#endif