From 80eedca82af2c10a0727ab85a38050de43f3c9d8 Mon Sep 17 00:00:00 2001 From: OBattler Date: Mon, 10 Jun 2024 03:55:12 +0200 Subject: [PATCH] Comment out the workaround for duplicate harfbuzz variales - it appears to no longer be needed. --- src/printer/CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/printer/CMakeLists.txt b/src/printer/CMakeLists.txt index dea0c7fbe..9fc555965 100644 --- a/src/printer/CMakeLists.txt +++ b/src/printer/CMakeLists.txt @@ -26,9 +26,9 @@ find_package(PkgConfig REQUIRED) pkg_check_modules(FREETYPE REQUIRED IMPORTED_TARGET freetype2) target_link_libraries(86Box PkgConfig::FREETYPE) if(STATIC_BUILD) - if(QT) + # if(QT) # Qt provides its own version of harfbuzz which leads to duplicated symbols. - target_link_options(86Box PRIVATE "LINKER:--allow-multiple-definition") - endif() + # target_link_options(86Box PRIVATE "LINKER:--allow-multiple-definition") + # endif() target_link_libraries(86Box -static ${FREETYPE_STATIC_LIBRARIES}) endif()