diff options
| author | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-09 23:51:55 +0200 |
|---|---|---|
| committer | Jan Holthuis <jan.holthuis@ruhr-uni-bochum.de> | 2020-04-18 14:44:55 +0200 |
| commit | 9b658d10124eb9c43816c380d09d1254a4ebc263 (patch) | |
| tree | 0191cf969ba1634296ba98e070dfd35a6e3bd4e4 /CMakeLists.txt | |
| parent | cfc41426326019c8afe868b3a1105ee1cbbacb88 (diff) | |
| parent | 1735f6016e98c573ed885d1eb7e7cb53b2919f8e (diff) | |
Merge branch 'master' of github.com:mixxxdj/mixxx into migrate-to-QJSEngine
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 167bb494ce..8161eb966b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -173,6 +173,9 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/analyzer/plugins/analyzersoundtouchbeats.cpp src/analyzer/plugins/buffering_utils.cpp src/analyzer/trackanalysisscheduler.cpp + src/audio/types.cpp + src/audio/signalinfo.cpp + src/audio/streaminfo.cpp src/control/control.cpp src/control/controlaudiotaperpot.cpp src/control/controlbehavior.cpp @@ -219,6 +222,7 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/controllers/keyboard/keyboardeventfilter.cpp src/controllers/learningutils.cpp src/controllers/midi/midicontroller.cpp + src/controllers/midi/midicontrollerpreset.cpp src/controllers/midi/midicontrollerpresetfilehandler.cpp src/controllers/midi/midienumerator.cpp src/controllers/midi/midimessage.cpp @@ -344,12 +348,14 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/library/banshee/bansheedbconnection.cpp src/library/banshee/bansheefeature.cpp src/library/banshee/bansheeplaylistmodel.cpp + src/library/basecoverartdelegate.cpp src/library/baseexternallibraryfeature.cpp src/library/baseexternalplaylistmodel.cpp src/library/baseexternaltrackmodel.cpp src/library/baseplaylistfeature.cpp src/library/basesqltablemodel.cpp src/library/basetrackcache.cpp + src/library/basetracktablemodel.cpp src/library/bpmdelegate.cpp src/library/browse/browsefeature.cpp src/library/browse/browsetablemodel.cpp @@ -561,7 +567,6 @@ add_library(mixxx-lib STATIC EXCLUDE_FROM_ALL src/track/tracknumbers.cpp src/track/trackrecord.cpp src/track/trackref.cpp - src/util/audiosignal.cpp src/util/autohidpi.cpp src/util/battery/battery.cpp src/util/cache.cpp @@ -1971,22 +1976,23 @@ if(HID) target_sources(mixxx-lib PRIVATE src/controllers/hid/hidcontroller.cpp src/controllers/hid/hidenumerator.cpp + src/controllers/hid/hidcontrollerpreset.cpp src/controllers/hid/hidcontrollerpresetfilehandler.cpp ) target_compile_definitions(mixxx-lib PUBLIC __HID__) if(HIDAPI_STATIC) message(STATUS "Linking internal libhidapi statically") add_library(mixxx-hidapi STATIC EXCLUDE_FROM_ALL) - target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi-0.8.0-rc1/hidapi) + target_include_directories(mixxx-hidapi SYSTEM PUBLIC lib/hidapi/hidapi) if(WIN32) - target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/windows/hid.c) + target_sources(mixxx-hidapi PRIVATE lib/hidapi/windows/hid.c) elseif(APPLE) - target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/mac/hid.c) + target_sources(mixxx-hidapi PRIVATE lib/hidapi/mac/hid.c) elseif(UNIX) if(NOT LibUSB_FOUND) message(FATAL_ERROR "USB HID controller support on Unix with statically linked libhidapi-libusb requires libusb 1.0 and its development headers.") endif() - target_sources(mixxx-hidapi PRIVATE lib/hidapi-0.8.0-rc1/libusb/hid.c) + target_sources(mixxx-hidapi PRIVATE lib/hidapi/libusb/hid.c) target_link_libraries(mixxx-hidapi PRIVATE LibUSB::LibUSB) else() message(FATAL_ERROR "USB HID controller support only possible on Windows/Mac OS/Linux/BSD.") |