diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-02-08 13:38:40 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-02-08 13:38:40 +0100 |
| commit | f672b0fc601812ea36bc8df94cbd56505296ffdc (patch) | |
| tree | f5ea53490980948eee165cbac5f9edb44a2ca48a /SConstruct | |
| parent | a7e58f50c0f5b4b740e2215b9a23f36b5258fa49 (diff) | |
| parent | 39bb625bfc5cc4b4cf4efb9bb7951698a7d3d3f1 (diff) | |
Merge branch 'master' of git@github.com:mixxxdj/mixxx.git into ffmpeg31
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/SConstruct b/SConstruct index cd708e9e10..62500c8ac6 100644 --- a/SConstruct +++ b/SConstruct @@ -51,7 +51,6 @@ available_features = [features.Mad, features.WavPack, features.ModPlug, features.TestSuite, - features.Vamp, features.ColorDiagnostics, features.Sanitizers, features.LocaleCompare, @@ -95,16 +94,10 @@ build.env.Alias("compiledb", build.env.CompilationDatabase('compile_commands.jso # Build compile_commands.json by default. build.env.Default("compile_commands.json") -# Build VAMP plugins. -mixxxminimal_plugins = SConscript( - 'vamp-plugins/SConscript', - variant_dir=build.build_dir + "/vamp-plugins", - duplicate=0, exports=['build']) - # Setup and build the "mixxx" executable target. Also sets up our install # targets for each platform. SConscript('SConscript', variant_dir=build.build_dir, duplicate=0, - exports=['build', 'sources', 'mixxxminimal_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")) |