Skip to content

Commit

Permalink
WIP - Build with QML module on the old UI
Browse files Browse the repository at this point in the history
  • Loading branch information
acolombier committed Sep 24, 2023
1 parent 4d2e6b0 commit 76375be
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
12 changes: 9 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -128,18 +128,23 @@ if(NOT CMAKE_CONFIGURATION_TYPES)
endif()

option(QT6 "Build with Qt6" ON)
option(QML "Build with QML" OFF)
option(QML "Build with QML" ON)
option(QML_UI "Build with the QML UI" OFF)
option(QOPENGL "Use QOpenGLWindow based widget instead of QGLWidget" ON)

if(QML AND NOT QT6)
message(FATAL_ERROR "Building with option QML=ON requires QT6=ON")
endif()

if(QML_UI AND NOT QML)
message(FATAL_ERROR "Building with option QML_UI=ON requires QML=ON")
endif()

if(QOPENGL)
add_compile_definitions(MIXXX_USE_QOPENGL)
endif()

if(QML)
if(QML_UI)
add_compile_definitions(MIXXX_USE_QML)
endif()

Expand Down Expand Up @@ -1216,7 +1221,8 @@ if(QML)
src/qml/qmlvisibleeffectsmodel.cpp
src/qml/qmlwaveformoverview.cpp
)
else()
endif()
if(NOT QML_UI)
target_sources(mixxx-lib PRIVATE
src/mixxxmainwindow.cpp
src/waveform/guitick.cpp
Expand Down
1 change: 1 addition & 0 deletions src/controllers/rendering/controllerrenderingengine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include "controllers/controller.h"
#include "controllers/scripting/legacy/controllerscriptenginelegacy.h"
#include "controllers/scripting/legacy/controllerscriptinterfacelegacy.h"
#include "moc_controllerrenderingengine.cpp"
#include "qml/qmlwaveformoverview.h"

ControllerRenderingEngine::ControllerRenderingEngine(Controller* controller,
Expand Down

0 comments on commit 76375be

Please sign in to comment.