diff options
| author | Tuukka Pasanen <pasanen.tuukka@gmail.com> | 2014-02-01 16:47:29 +0200 |
|---|---|---|
| committer | Tuukka Pasanen <pasanen.tuukka@gmail.com> | 2014-02-01 16:47:29 +0200 |
| commit | a27d65caf00d15fd7d660f3731fed2b902848991 (patch) | |
| tree | 2951a01e1d75fc45282a46d756f65790f9f6c0b9 /SConstruct | |
| parent | 0e196b17057674bedc94a96b5986ca09e92a9d41 (diff) | |
| parent | fbc41067022e0c7876449813ce3142c16678fc6a (diff) | |
Merge remote-tracking branch 'upstream/master' into opus
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/SConstruct b/SConstruct index 3cbf2673db..20c2e2651d 100644 --- a/SConstruct +++ b/SConstruct @@ -32,8 +32,7 @@ machine = ARGUMENTS.get('machine', None) build_type = ARGUMENTS.get('build', None) toolchain = ARGUMENTS.get('toolchain', None) -available_features = [features.HifiEq, - features.Mad, +available_features = [features.Mad, features.CoreAudio, features.MediaFoundation, features.HSS1394, @@ -56,6 +55,8 @@ available_features = [features.HifiEq, features.MSVSHacks, features.Vamp, features.AutoDjCrates, + features.ColorDiagnostics, + features.AddressSanitizer, # "Features" of dubious quality features.PerfTools, @@ -103,7 +104,9 @@ SConscript(File('src/SConscript'), variant_dir=Dir(build.build_dir), duplicate=0 # For convenience, copy the Mixxx binary out of the build directory to the # root. Don't do it on windows because the binary can't run on its own and needs # the DLLs present with it. -if not build.platform_is_windows: +if build.platform_is_osx: + Command("mixxx", os.path.join(build.build_dir, "Mixxx"), Copy("$TARGET", "$SOURCE")) +elif not build.platform_is_windows: Command("mixxx", os.path.join(build.build_dir, "mixxx"), Copy("$TARGET", "$SOURCE")) |