From 9718ef7c2dd43585793048d229d58d71094cc3f8 Mon Sep 17 00:00:00 2001
From: RJ Ryan <rryan@mixxx.org>
Date: Tue, 31 Dec 2013 04:12:51 -0500
Subject: Remove 'hifieq' SCons option.

The EQ type is toggle-able at runtime now so it doesn't make sense to keep this
build option.
---
 SConstruct | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index 19e35c1244..d439687f68 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,
-- 
cgit v1.2.3


From dad6c31d02ec3afa71488c6046739527d71ddfc9 Mon Sep 17 00:00:00 2001
From: RJ Ryan <rryan@mixxx.org>
Date: Fri, 17 Jan 2014 18:43:08 -0500
Subject: Add Clang-based features: address sanitizer and color diagnostics.

---
 SConstruct | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index d439687f68..f64e3c9c9a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -54,6 +54,8 @@ available_features = [features.Mad,
                       features.MSVSHacks,
                       features.Vamp,
                       features.AutoDjCrates,
+                      features.ColorDiagnostics,
+                      features.AddressSanitizer,
 
                       # "Features" of dubious quality
                       features.PerfTools,
-- 
cgit v1.2.3


From 3ce64352ad37e36f7bfd873e96752df61ff12d74 Mon Sep 17 00:00:00 2001
From: RJ Ryan <rryan@mixxx.org>
Date: Wed, 29 Jan 2014 00:02:59 -0500
Subject: Fix recent build copying on OS X.

---
 SConstruct | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'SConstruct')

diff --git a/SConstruct b/SConstruct
index f64e3c9c9a..f68e07d065 100644
--- a/SConstruct
+++ b/SConstruct
@@ -103,7 +103,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"))
 
 
-- 
cgit v1.2.3