Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-10 15:23:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

workaround plugin build failures

Browse source
This commit is contained in:
Stephen Birarda 2016-08-31 16:45:12 -07:00
parent 85ba0f36cf
commit 6efa47a04e
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/CMakeLists.txt
View file

@ -168,7 +168,7 @@ if (WIN32)
endif() endif()
if (NOT ANDROID) if (NOT ANDROID)
set(${NON_ANDROID_LIBRARIES} controllers ui-plugins display-plugins input-plugins steamworks-wrapper) set(${NON_ANDROID_LIBRARIES} steamworks-wrapper)
endif () endif ()
# link required hifi libraries # link required hifi libraries
@ -178,6 +178,7 @@ link_hifi_libraries(
audio audio-client animation script-engine physics audio audio-client animation script-engine physics
render-utils entities-renderer ui auto-updater render-utils entities-renderer ui auto-updater
controllers plugins controllers plugins
ui-plugins display-plugins input-plugins
${NON_ANDROID_LIBRARIES} ${NON_ANDROID_LIBRARIES}
) )

5
libraries/plugins/src/plugins/PluginManager.cpp
View file

@ -115,6 +115,8 @@ const LoaderList& getLoadedPlugins() {
PluginManager::PluginManager() { PluginManager::PluginManager() {
} }
#ifndef Q_OS_ANDROID
// TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class // TODO migrate to a DLL model where plugins are discovered and loaded at runtime by the PluginManager class
extern DisplayPluginList getDisplayPlugins(); extern DisplayPluginList getDisplayPlugins();
extern InputPluginList getInputPlugins(); extern InputPluginList getInputPlugins();
@ -137,6 +139,7 @@ const DisplayPluginList& PluginManager::getDisplayPlugins() {
// Grab the built in plugins // Grab the built in plugins
displayPlugins = ::getDisplayPlugins(); displayPlugins = ::getDisplayPlugins();
// Now grab the dynamic plugins // Now grab the dynamic plugins
for (auto loader : getLoadedPlugins()) { for (auto loader : getLoadedPlugins()) {
DisplayProvider* displayProvider = qobject_cast<DisplayProvider*>(loader->instance()); DisplayProvider* displayProvider = qobject_cast<DisplayProvider*>(loader->instance());
@ -270,3 +273,5 @@ void PluginManager::disableInputs(const QStringList& inputs) {
void PluginManager::saveSettings() { void PluginManager::saveSettings() {
saveInputPluginSettings(getInputPlugins()); saveInputPluginSettings(getInputPlugins());
} }
#endif