diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-03-16 17:41:07 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-03-16 17:41:07 +0100 |
| commit | cb82a4d97d8aa29be817164ecee94844a37051b8 (patch) | |
| tree | 3ce31541b8367c261b57177e8883fd332391a8fb /build | |
| parent | 9ada84a329dc5c772dda2c897908e0694fac2b44 (diff) | |
| parent | e16b6a63b28eab4d3c3ce919ed661a91d7fc664d (diff) | |
Merge branch 'master' into basetracktablemodel
Diffstat (limited to 'build')
| -rw-r--r-- | build/depends.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/build/depends.py b/build/depends.py index 8aecd5b524..2b5198666f 100644 --- a/build/depends.py +++ b/build/depends.py @@ -790,6 +790,7 @@ class MixxxCore(Feature): "src/preferences/effectsettingsmodel.cpp", "src/preferences/broadcastprofile.cpp", "src/preferences/upgrade.cpp", + "src/preferences/colorpalettesettings.cpp", "src/preferences/dlgpreferencepage.cpp", "src/effects/effectmanifest.cpp", @@ -925,7 +926,8 @@ class MixxxCore(Feature): "src/controllers/midi/midioutputhandler.cpp", "src/controllers/softtakeover.cpp", "src/controllers/keyboard/keyboardeventfilter.cpp", - "src/controllers/colorjsproxy.cpp", + "src/controllers/colormapper.cpp", + "src/controllers/colormapperjsproxy.cpp", "src/main.cpp", "src/mixxx.cpp", @@ -1285,6 +1287,7 @@ class MixxxCore(Feature): "src/util/cache.cpp", "src/util/console.cpp", "src/util/color/color.cpp", + "src/util/color/colorpalette.cpp", "src/util/db/dbconnection.cpp", "src/util/db/dbconnectionpool.cpp", "src/util/db/dbconnectionpooler.cpp", @@ -1311,8 +1314,7 @@ class MixxxCore(Feature): "src/util/desktophelper.cpp", "src/util/widgetrendertimer.cpp", "src/util/workerthread.cpp", - "src/util/workerthreadscheduler.cpp", - "src/util/color/predefinedcolor.cpp" + "src/util/workerthreadscheduler.cpp" ] proto_args = { |