diff options
117 files changed, 623 insertions, 207 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 47165c6285..d7cc9d03a2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1411,6 +1411,7 @@ * Add controller mapping for Native Instrument Traktor Kontrol S3 [#3031](https://github.com/mixxxdj/mixxx/pull/3031) * Add controller mapping for Behringer BCR2000 [#3342](https://github.com/mixxxdj/mixxx/pull/3342) [#3943](https://github.com/mixxxdj/mixxx/pull/3943) * Add controller mapping for Behringer DDM4000 [#3542](https://github.com/mixxxdj/mixxx/pull/3542) +* Add controller mapping for Native Instruments Traktor Kontrol S4MK3 [#11284](https://github.com/mixxxdj/mixxx/pull/11284) * Update controller mapping for Allen & Heath Xone K2 to add intro/outro cues [#2236](https://github.com/mixxxdj/mixxx/pull/2236) * Update controller mapping for Hercules P32 for more accurate headmix control [#3537](https://github.com/mixxxdj/mixxx/pull/3537) * Update controller mapping for Native Instruments Traktor Kontrol S4MK2 to add auto-slip mode and pitch fader range [#3331](https://github.com/mixxxdj/mixxx/pull/3331) diff --git a/CMakeLists.txt b/CMakeLists.txt index 807f63f919..fa5b4109df 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,24 @@ if(POLICY CMP0135) cmake_policy(SET CMP0135 NEW) endif() +function(FATAL_ERROR_MISSING_ENV) + if(WIN32) + if(CMAKE_BUILD_TYPE MATCHES "Debug") + message(FATAL_ERROR "Did you download the Mixxx build environment using ´${CMAKE_SOURCE_DIR}/tools/windows_buildenv.bat´?") + else() + message(FATAL_ERROR "Did you download the Mixxx build environment using ´${CMAKE_SOURCE_DIR}/tools/windows_release_buildenv.bat´ or ´${CMAKE_SOURCE_DIR}/tools/windows_buildenv.bat´(includes Debug)?") + endif() + elseif(APPLE) |