summaryrefslogtreecommitdiffstats
path: root/SConstruct
diff options
context:
space:
mode:
authorDaniel Schürmann <daschuer@mixxx.org>2017-03-15 20:21:38 +0100
committerDaniel Schürmann <daschuer@mixxx.org>2017-03-16 20:21:38 +0100
commitd6d9d53193ad2629b0c10985f52ae6f108f16499 (patch)
treea1b4873c03f71f9a5712c113b78578f5db715333 /SConstruct
parent04284c159b133d44a4af53f7473494bbf42ed8c2 (diff)
parent6a6ab54fa5bb6846501207735edf610730a9aa5c (diff)
Merge commit '6a6ab54fa5bb6846501207735edf610730a9aa5c' into lv2_support2
Conflicts: SConstruct build/features.py
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct1
1 files changed, 1 insertions, 0 deletions
diff --git a/SConstruct b/SConstruct
index 12f9315496..e3c40a9ba0 100644
--- a/SConstruct
+++ b/SConstruct
@@ -57,6 +57,7 @@ available_features = [features.Mad,
features.AddressSanitizer,
features.LocaleCompare,
features.Lilv,
+ features.Battery,
# "Features" of dubious quality
features.PerfTools,