diff options
| author | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-10-26 08:53:36 -0700 |
|---|---|---|
| committer | RJ Skerry-Ryan <rryan@mixxx.org> | 2018-10-26 08:53:36 -0700 |
| commit | d0e2d2d12d2b9853fa7aaba60928385df103fe23 (patch) | |
| tree | 726e9fa36d10438f7fac4f0b22cbf3b9c1ed740d /SConstruct | |
| parent | cfa1f632ee1ff827effc036eee10e0a7fb65907f (diff) | |
| parent | 398b533a847db24ddb6f3d30e1d2964f62308cbf (diff) | |
Merge remote-tracking branch 'mixxxdj/master' into remove-vamp
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 26 |
1 files changed, 23 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 7b4e22857e..910ac5d956 100644 --- a/SConstruct +++ b/SConstruct @@ -60,7 +60,6 @@ available_features = [features.Mad, # "Features" of dubious quality features.PerfTools, features.AsmLib, - features.IPod, features.FFMPEG, # Experimental features @@ -74,14 +73,35 @@ Export('build') # Run our configuration stuff to setup our build environment (detect # platform/arch, find libraries, etc) -SConscript(File('src/SConscript.env'), variant_dir=Dir(build.build_dir), duplicate=0) + +# If the variant_dir does not exist then we will not chdir into it when calling +# SConscript.env, making the imperative logic (e.g. writing build.h) in +# SConscript.env behave differently on the first invocation vs. subsequent +# invocations. +try: + os.mkdir(build.build_dir) +except: + pass +SConscript('SConscript.env', variant_dir=build.build_dir, duplicate=0) # Grab the list of sources generated by SConscript.env Import('sources') +# Produce compile_commands.json, which is used by clang-tidy and related tools. +build.env.Tool("compile_commands") +build.env.Alias("compiledb", build.env.CompilationDatabase('compile_commands.json')) +# 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(File('src/SConscript'), variant_dir=Dir(build.build_dir), duplicate=0, +SConscript('SConscript', variant_dir=build.build_dir, duplicate=0, exports=['build', 'sources']) #On OS X, if the bundle has been built, copy it up: |