diff options
| author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-09-19 19:15:40 -0700 |
|---|---|---|
| committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-09-19 19:55:32 -0700 |
| commit | b361458763bbcec87212c325d88f7c57ee541da4 (patch) | |
| tree | 1caf0cf8f9465d9bebac1db025707ffd2107cf5c /SConstruct | |
| parent | 81185b0bff396e09ac0be113cac8e9b97445a0da (diff) | |
Remove SoundSource plugins. Move SoundSourceM4A and SoundSourceWV into Mixxx.
Fixes Bug #1792747.
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index 37b6a3a166..70811db0e3 100644 --- a/SConstruct +++ b/SConstruct @@ -80,17 +80,6 @@ SConscript(File('src/SConscript.env'), variant_dir=Dir(build.build_dir), duplica # Grab the list of sources generated by SConscript.env Import('sources') -# Make the main src directory accessible to the SoundSourceM4A, so -# SoundSourceM4A can get at sounddevice.cpp, which it needs to build -# and link properly. This sucks but it's the best way I can find -- bkgood -VariantDir("plugins/soundsourcem4a", "src", duplicate=0) -VariantDir("plugins/soundsourcewv", "src", duplicate=0) - -# Build our soundsource plugins -soundsource_plugins = SConscript( - File('plugins/SConscript'), variant_dir=Dir(build.build_dir + "/plugins"), - duplicate=0, exports=['build']) - #Build Vamp minimal plugins #VariantDir("vamp-plugins", "src", duplicate=0) mixxxminimal_depends = [ depends.SoundTouch ] @@ -102,7 +91,7 @@ mixxxminimal_plugins = SConscript( # Setup and build the "mixxx" executable target. Also sets up our install # targets for each platform. SConscript(File('src/SConscript'), variant_dir=Dir(build.build_dir), duplicate=0, - exports=['build', 'sources', 'soundsource_plugins', 'mixxxminimal_plugins']) + exports=['build', 'sources', 'mixxxminimal_plugins']) #On OS X, if the bundle has been built, copy it up: #Command("Mixxx.app", os.path.join(build.build_dir, "Mixxx.app"), Copy("$TARGET", "$SOURCE")) |