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 /CMakeLists.txt | |
parent | 21afe4d157f44185aaf791ad7083da9913a3168a (diff) | |
parent | f7f5277de8a867dfc7c710f24ed31b8fa3350a6a (diff) |
Merge branch 'master' into track-colors
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 545d51b0cf..1eac5b210c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -399,6 +399,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/library/scanner/scannertask.cpp src/library/searchquery.cpp src/library/searchqueryparser.cpp + src/library/serato/seratofeature.cpp + src/library/serato/seratoplaylistmodel.cpp src/library/setlogfeature.cpp src/library/sidebarmodel.cpp src/library/songdownloader.cpp @@ -515,7 +517,8 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL 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/trackfile.cpp src/track/trackinfo.cpp @@ -968,6 +971,7 @@ add_executable(mixxx-test src/test/sampleutiltest.cpp src/test/schemamanager_test.cpp src/test/searchqueryparsertest.cpp + src/test/seratomarkerstest.cpp src/test/seratomarkers2test.cpp src/test/signalpathtest.cpp src/test/skincontext_test.cpp |