maelstrom/openblocks
1
1
Fork 0
Code Issues 1 Pull requests Projects Releases 3 Packages Wiki Activity Actions

fix(cmake): missing freetype dependency + Qt6PrintSupport

Browse source
This commit is contained in:
maelstrom 2025-07-07 21:31:19 +02:00
parent d558f166f9
commit 43a7a23688
2 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
editor/CMakeLists.txt
View file

@ -98,14 +98,6 @@ add_custom_command(
if (WIN32) if (WIN32)
#include("${QT_DEPLOY_SUPPORT}") #include("${QT_DEPLOY_SUPPORT}")
# TODO: Add other translations
add_custom_command(
TARGET editor POST_BUILD
COMMAND ${WINDEPLOYQT_EXECUTABLE} $<TARGET_FILE:editor> --translations en --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler --plugindir $<TARGET_FILE_DIR:editor>/qtplugins
)
# No sense adding opengl-sw given that hardware acceleration is necessary, anyway
# Also don't want to clutter with plugins, add only needed ones
# Copy over QScintilla DLLs # Copy over QScintilla DLLs
# TODO: Use a better approach? # TODO: Use a better approach?
add_custom_command( add_custom_command(
@ -113,6 +105,15 @@ if (WIN32)
COMMAND ${CMAKE_COMMAND} -E copy ${QSCINTILLA_DLLS} $<TARGET_FILE_DIR:editor> COMMAND ${CMAKE_COMMAND} -E copy ${QSCINTILLA_DLLS} $<TARGET_FILE_DIR:editor>
) )
# TODO: Add other translations
add_custom_command(
TARGET editor POST_BUILD
COMMAND ${WINDEPLOYQT_EXECUTABLE} $<TARGET_FILE:editor> ${QSCINTILLA_DLLS} --dir $<TARGET_FILE_DIR:editor> --translations en --no-compiler-runtime --no-opengl-sw --no-system-d3d-compiler --plugindir $<TARGET_FILE_DIR:editor>/qtplugins
)
# No sense adding opengl-sw given that hardware acceleration is necessary, anyway
# Also don't want to clutter with plugins, add only needed ones
# Copy qt.conf to override default plugins location # Copy qt.conf to override default plugins location
add_custom_command( add_custom_command(
TARGET editor POST_BUILD TARGET editor POST_BUILD

3
vcpkg.json
View file

@ -8,7 +8,8 @@
"stb", "stb",
"reactphysics3d", "reactphysics3d",
"pkgconf", "pkgconf",
"luajit" "luajit",
"freetype"
], ],
"overrides": [ "overrides": [
{ {