mirror of
https://github.com/monero-project/monero-gui.git
synced 2025-01-09 19:32:03 +02:00
Merge pull request #3082
8643f85
cmake: MinGW - fix qtfreetype linking (xiphon)
This commit is contained in:
commit
ea778c41dd
@ -334,8 +334,6 @@ if(STATIC)
|
|||||||
endforeach()
|
endforeach()
|
||||||
|
|
||||||
if(MINGW)
|
if(MINGW)
|
||||||
list(APPEND QT5_EXTRA_LIBRARIES qtfreetype)
|
|
||||||
|
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
|
||||||
list(APPEND QT5_EXTRA_LIBRARIES D3D11 Dwrite D2d1)
|
list(APPEND QT5_EXTRA_LIBRARIES D3D11 Dwrite D2d1)
|
||||||
endif()
|
endif()
|
||||||
@ -360,6 +358,8 @@ if(STATIC)
|
|||||||
Qt5ServiceSupport
|
Qt5ServiceSupport
|
||||||
Qt5GlxSupport
|
Qt5GlxSupport
|
||||||
)
|
)
|
||||||
|
elseif(MINGW)
|
||||||
|
list(APPEND QT5_INTEGRATION_LIBRARIES_LIST qtfreetype)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
foreach(LIBRARY ${QT5_INTEGRATION_LIBRARIES_LIST})
|
foreach(LIBRARY ${QT5_INTEGRATION_LIBRARIES_LIST})
|
||||||
|
Loading…
Reference in New Issue
Block a user