diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-02-16 20:53:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-16 20:53:34 +0100 |
| commit | 6019dbe754aa27cde4dceba994629175d38f9f1a (patch) | |
| tree | 3ec729d08249f69c31298525f260c8dff6928fa9 /build | |
| parent | 21afe4d157f44185aaf791ad7083da9913a3168a (diff) | |
| parent | f7f5277de8a867dfc7c710f24ed31b8fa3350a6a (diff) | |
Merge branch 'master' into track-colors
Diffstat (limited to 'build')
| -rw-r--r-- | build/depends.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/build/depends.py b/build/depends.py index 91b031d13c..88dce0befd 100644 --- a/build/depends.py +++ b/build/depends.py @@ -1082,6 +1082,8 @@ class MixxxCore(Feature): "src/library/itunes/itunesfeature.cpp", "src/library/traktor/traktorfeature.cpp", + "src/library/serato/seratofeature.cpp", + "src/library/serato/seratoplaylistmodel.cpp", "src/library/rekordbox/rekordboxfeature.cpp", "src/library/rekordbox/rekordbox_pdb.cpp", @@ -1207,7 +1209,8 @@ class MixxxCore(Feature): "src/track/keyutils.cpp", "src/track/playcounter.cpp", "src/track/replaygain.cpp", - "src/track/seratomarkers2.cpp", + "src/track/serato/markers.cpp", + "src/track/serato/markers2.cpp", "src/track/track.cpp", "src/track/globaltrackcache.cpp", "src/track/trackfile.cpp", |