diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2019-06-30 22:21:09 +0200 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2019-06-30 22:21:09 +0200 |
| commit | 2d7392a8e44aa92bfd2fd5f04b3b04da5b83b420 (patch) | |
| tree | fbc10979a437d568f0c5e965762c9b2205bc1a2d /SConstruct | |
| parent | 935563effc9c018532162c23f95c027ee11f4651 (diff) | |
| parent | bc1310eebaa29e3b83668e9804125f10b6b21467 (diff) | |
Merge branch 'master' of git@github.com:mixxxdj/mixxx.git into ffmpeg31
# Conflicts:
# .travis.yml
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct index 7610967a37..a4f3b07cb0 100644 --- a/SConstruct +++ b/SConstruct @@ -57,15 +57,12 @@ available_features = [features.Mad, features.LocaleCompare, features.Lilv, features.Battery, + features.QtKeychain, # "Features" of dubious quality features.PerfTools, features.AsmLib, - features.FFMPEG, - - # Experimental features - features.OpenGLES, - features.QtKeychain + features.FFMPEG ] build = mixxx.MixxxBuild(target, machine, build_type, |