Merge branch 'master' into remove-vamp

1 files changed, 9 insertions, 19 deletions

diff --git a/SConstruct b/SConstruct
index 75eadb87ec..7b4e22857e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -12,10 +12,11 @@ import os
 # iX86-linux-gnu
 # x86_64-linux-gnu
 
-# platform = [win, osx, bsd, linux]
+# target = [windows, osx, bsd, linux]
 # machine = [iX86, x86_64, powerpc, powerpc64]
 # toolchain = [gnu, msvc]
-# target = [debug, release]
+# build = [debug, release]
+# optimize = [off, portable, native, legacy, fastbuild, 0, 1, 2]
 
 # If you don't specify your platform, we autodetect platform/machine using
 # python. If you don't specify your machine then we pick iX86 by default
@@ -44,7 +45,6 @@ available_features = [features.Mad,
                       features.Opus,
                       features.Profiling,
                       features.BuildTime,
-                      features.QDebug,
                       features.Verbose,
                       features.Optimize,
                       features.FAAD,
@@ -52,8 +52,9 @@ available_features = [features.Mad,
                       features.ModPlug,
                       features.TestSuite,
                       features.ColorDiagnostics,
-                      features.AddressSanitizer,
+                      features.Sanitizers,
                       features.LocaleCompare,
+                      features.Lilv,
                       features.Battery,
 
                       # "Features" of dubious quality
@@ -62,8 +63,9 @@ available_features = [features.Mad,
                       features.IPod,
                       features.FFMPEG,
 
-		     # Experimental features
-		     features.OpenGLES
+                      # Experimental features
+                      features.OpenGLES,
+                      features.QtKeychain
                       ]
 
 build = mixxx.MixxxBuild(target, machine, build_type,
@@ -77,22 +79,10 @@ 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)
-VariantDir("plugins/soundsourcemediafoundation", "src", duplicate=0)
-
-# Build our soundsource plugins
-soundsource_plugins = SConscript(
-    File('plugins/SConscript'), variant_dir=Dir(build.build_dir + "/plugins"),
-    duplicate=0, exports=['build'])
-
 # 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'])
+           exports=['build', 'sources'])
 
 #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"))