summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRJ Ryan <rryan@mixxx.org>2014-03-29 14:56:18 -0400
committerRJ Ryan <rryan@mixxx.org>2014-03-29 14:56:18 -0400
commitce3c11918af1ccd17ba995e0e6e4b6169c843782 (patch)
tree7d94c571bc7ea3f48bbe3a75aa10f1cc4ab80f76 /plugins
parentf5ac43b085951af2480ea3137623391b9d5a7076 (diff)
Get rid of individual variant dirs for SoundSource plugins. Add $BUILD_DIR/plugins to the SoundSource plugin search path if the folder exists. Fixes Bug 1196833.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/SConscript6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/SConscript b/plugins/SConscript
index 3d461a8188..f69081c8d3 100644
--- a/plugins/SConscript
+++ b/plugins/SConscript
@@ -7,19 +7,19 @@ plugins = []
soundsourcem4a = SConscript(
File('soundsourcem4a/SConscript'),
- variant_dir=Dir(build.build_dir + "/m4a"),
+ variant_dir=Dir(build.build_dir),
duplicate=0, exports=['build'])
plugins.extend(soundsourcem4a)
soundsourcewv = SConscript(
File('soundsourcewv/SConscript'),
- variant_dir=Dir(build.build_dir + "/wv"),
+ variant_dir=Dir(build.build_dir),
duplicate=0, exports=['build'])
plugins.extend(soundsourcewv)
soundsourcemediafoundation = SConscript(
File('soundsourcemediafoundation/SConscript'),
- variant_dir=Dir(build.build_dir + "/mediafoundation"),
+ variant_dir=Dir(build.build_dir),
duplicate=0, exports=['build'])
plugins.extend(soundsourcemediafoundation)