claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Comment out the workaround for duplicate harfbuzz variales - it appears to no longer be needed.

Browse Source
This commit is contained in:
OBattler
2024-06-10 03:55:12 +02:00
parent c852c99d8f
commit 80eedca82a
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/printer/CMakeLists.txt
View File

@@ -26,9 +26,9 @@ find_package(PkgConfig REQUIRED)
pkg_check_modules(FREETYPE REQUIRED IMPORTED_TARGET freetype2) pkg_check_modules(FREETYPE REQUIRED IMPORTED_TARGET freetype2)
target_link_libraries(86Box PkgConfig::FREETYPE) target_link_libraries(86Box PkgConfig::FREETYPE)
if(STATIC_BUILD) if(STATIC_BUILD)
if(QT) # if(QT)
# Qt provides its own version of harfbuzz which leads to duplicated symbols. # Qt provides its own version of harfbuzz which leads to duplicated symbols.
target_link_options(86Box PRIVATE "LINKER:--allow-multiple-definition") # target_link_options(86Box PRIVATE "LINKER:--allow-multiple-definition")
endif() # endif()
target_link_libraries(86Box -static ${FREETYPE_STATIC_LIBRARIES}) target_link_libraries(86Box -static ${FREETYPE_STATIC_LIBRARIES})
endif() endif()