Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,9 @@ find_package(${QT_VERSION} REQUIRED
OPTIONAL_COMPONENTS
WebSockets
WebView
WebChannel
WebEngineCore
WebEngineQuick
Svg
CorePrivate
GuiPrivate
Expand Down
12 changes: 12 additions & 0 deletions ci/win32.mingw.build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions src/app/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion src/lib/core/application/SafeQApplication.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/score-plugin-gfx/Gfx/Video/View.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ View::~View()
{
ossia::qt::run_async(m_thumb, &QObject::deleteLater);

score::ThreadPool::instance().releaseThread();
// score::ThreadPool::instance().releaseThread();
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/score-plugin-jit/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
project(score_plugin_jit LANGUAGES CXX)

return()
if(NOT APPLE)
if(CMAKE_SYSTEM_PROCESSOR MATCHES arm)
return()
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/score-plugin-ysfx/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
project(score_plugin_ysfx LANGUAGES CXX)

if(MSVC)
return()
endif()
if(NOT TARGET score_plugin_engine)
return()
endif()
Expand Down