summaryrefslogtreecommitdiff
path: root/plugins/switcher
diff options
context:
space:
mode:
authorSam Spilsbury <SmSpillaz@gmail.com>2010-05-15 12:54:32 +0800
committerSam Spilsbury <SmSpillaz@gmail.com>2010-05-15 12:54:32 +0800
commit9ba6b2fc793b88e3d7775fe36a5915a96641b5da (patch)
treeca2e9d5d26b78c3477ed512d80a8f557196198b4 /plugins/switcher
parentc3d7dd9fb629fd85530b24fa7b14c7e5824f97ad (diff)
downloadcompiz-with-glib-mainloop-9ba6b2fc793b88e3d7775fe36a5915a96641b5da.tar.gz
compiz-with-glib-mainloop-9ba6b2fc793b88e3d7775fe36a5915a96641b5da.tar.bz2
Add necessary changes to compile without rpath usage
Diffstat (limited to 'plugins/switcher')
-rw-r--r--plugins/switcher/src/switcher.cpp7
-rw-r--r--plugins/switcher/switcher.xml.in2
2 files changed, 6 insertions, 3 deletions
diff --git a/plugins/switcher/src/switcher.cpp b/plugins/switcher/src/switcher.cpp
index d7a8f8c..6467fe1 100644
--- a/plugins/switcher/src/switcher.cpp
+++ b/plugins/switcher/src/switcher.cpp
@@ -1175,9 +1175,10 @@ SwitchWindow::SwitchWindow (CompWindow *window) :
bool
SwitchPluginVTable::init ()
{
- if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) |
- !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) |
- !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI))
+ if (!CompPlugin::checkPluginABI ("core", CORE_ABIVERSION) ||
+ !CompPlugin::checkPluginABI ("composite", COMPIZ_COMPOSITE_ABI) ||
+ !CompPlugin::checkPluginABI ("opengl", COMPIZ_OPENGL_ABI) ||
+ !CompPlugin::checkPluginABI ("compiztoolbox", COMPIZ_COMPIZTOOLBOX_ABI))
return false;
return true;
diff --git a/plugins/switcher/switcher.xml.in b/plugins/switcher/switcher.xml.in
index c29d2da..028a730 100644
--- a/plugins/switcher/switcher.xml.in
+++ b/plugins/switcher/switcher.xml.in
@@ -5,7 +5,9 @@
<category>Window Management</category>
<deps>
<requirement>
+ <plugin>composite</plugin>
<plugin>opengl</plugin>
+ <plugin>compiztoolbox</plugin>
</requirement>
</deps>
<options>