From 7c138413bd94f02c932b4783a0e104ec11e86397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Micha=C3=ABl=20Celerier?= Date: Thu, 2 Apr 2026 08:57:04 -0400 Subject: [PATCH] [ci skip] wip: webengine support --- CMakeLists.txt | 3 +++ ci/win32.mingw.build.sh | 12 ++++++++++++ src/app/CMakeLists.txt | 6 ++++++ src/lib/core/application/SafeQApplication.cpp | 2 +- src/plugins/score-plugin-gfx/Gfx/Video/View.cpp | 2 +- src/plugins/score-plugin-jit/CMakeLists.txt | 2 +- src/plugins/score-plugin-ysfx/CMakeLists.txt | 4 +++- 7 files changed, 27 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6475db0a5f..e3d5650a62 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,6 +250,9 @@ find_package(${QT_VERSION} REQUIRED OPTIONAL_COMPONENTS WebSockets WebView + WebChannel + WebEngineCore + WebEngineQuick Svg CorePrivate GuiPrivate diff --git a/ci/win32.mingw.build.sh b/ci/win32.mingw.build.sh index b0fcffadc6..ca9a9b7f7e 100755 --- a/ci/win32.mingw.build.sh +++ b/ci/win32.mingw.build.sh @@ -23,3 +23,15 @@ cmake -S "$SCORE_DIR" -B build \ cmake --build build cmake --build build --target install +d:\dev\cmake\bin\cmake.exe -S score -B build-clang-cl -GNinja -DCMAKE_BUILD_TYPE=Release ^ + -DCMAKE_C_COMPILER=clang-cl ^ + -DCMAKE_CXX_COMPILER=clang-cl ^ + -DOSSIA_SDK=c:/ossia-sdk-msvc ^ + -DCMAKE_C_USE_RESPONSE_FILE_FOR_OBJECTS=1 ^ + -DCMAKE_NINJA_FORCE_RESPONSE_FILE=1 ^ + -DSCORE_DISABLE_SNMALLOC=1 ^ + -DSCORE_PCH=1 ^ + -DFETCHCONTENT_FULLY_DISCONNECTED=1 ^ + -DCMAKE_C_FLAGS=" -D_WIN32_WINNT_=0x0A00 -DWINVER=0x0A00 " ^ + -DCMAKE_CXX_FLAGS=" -D_WIN32_WINNT_=0x0A00 -DWINVER=0x0A00 " ^ + -DCMAKE_PREFIX_PATH=D:/6.10.1/msvc2022_64 \ No newline at end of file diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt index c7d4466637..c0fed0e92e 100755 --- a/src/app/CMakeLists.txt +++ b/src/app/CMakeLists.txt @@ -94,6 +94,12 @@ if(TARGET snmalloc) endif() endif() +if(TARGET "${QT_PREFIX}::WebEngine") + target_link_libraries(${APPNAME} PRIVATE "${QT_PREFIX}::WebEngine") +endif() +if(TARGET "${QT_PREFIX}::WebEngineQuick") + target_link_libraries(${APPNAME} PRIVATE "${QT_PREFIX}::WebEngineQuick") +endif() if(TARGET "${QT_PREFIX}::WebView") target_link_libraries(${APPNAME} PRIVATE "${QT_PREFIX}::WebView") endif() diff --git a/src/lib/core/application/SafeQApplication.cpp b/src/lib/core/application/SafeQApplication.cpp index 99026e7c9a..d77d2112ad 100644 --- a/src/lib/core/application/SafeQApplication.cpp +++ b/src/lib/core/application/SafeQApplication.cpp @@ -26,7 +26,7 @@ void SafeQApplication::DebugOutput( auto basename_arr = QFileInfo(context.file).baseName().toUtf8(); auto basename = basename_arr.constData(); FILE* out_file = stderr; -#if defined(_MSC_VER) +#if defined(_MSC_VER) && 0 static LogFile logger; out_file = logger.desc(); #endif diff --git a/src/plugins/score-plugin-gfx/Gfx/Video/View.cpp b/src/plugins/score-plugin-gfx/Gfx/Video/View.cpp index 81a1be435f..61e0e7b2f7 100644 --- a/src/plugins/score-plugin-gfx/Gfx/Video/View.cpp +++ b/src/plugins/score-plugin-gfx/Gfx/Video/View.cpp @@ -49,7 +49,7 @@ View::~View() { ossia::qt::run_async(m_thumb, &QObject::deleteLater); - score::ThreadPool::instance().releaseThread(); + // score::ThreadPool::instance().releaseThread(); } } diff --git a/src/plugins/score-plugin-jit/CMakeLists.txt b/src/plugins/score-plugin-jit/CMakeLists.txt index 72b84535de..d5306a0446 100644 --- a/src/plugins/score-plugin-jit/CMakeLists.txt +++ b/src/plugins/score-plugin-jit/CMakeLists.txt @@ -1,5 +1,5 @@ project(score_plugin_jit LANGUAGES CXX) - +return() if(NOT APPLE) if(CMAKE_SYSTEM_PROCESSOR MATCHES arm) return() diff --git a/src/plugins/score-plugin-ysfx/CMakeLists.txt b/src/plugins/score-plugin-ysfx/CMakeLists.txt index d06fbcbf7c..582e0d71bb 100644 --- a/src/plugins/score-plugin-ysfx/CMakeLists.txt +++ b/src/plugins/score-plugin-ysfx/CMakeLists.txt @@ -1,5 +1,7 @@ project(score_plugin_ysfx LANGUAGES CXX) - +if(MSVC) + return() +endif() if(NOT TARGET score_plugin_engine) return() endif()