Merge pull request #3082

8643f85 cmake: MinGW - fix qtfreetype linking (xiphon)
This commit is contained in:
luigi1111 2020-09-14 11:35:27 -05:00
commit ea778c41dd
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -334,8 +334,6 @@ if(STATIC)
endforeach()
if(MINGW)
list(APPEND QT5_EXTRA_LIBRARIES qtfreetype)
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
list(APPEND QT5_EXTRA_LIBRARIES D3D11 Dwrite D2d1)
endif()
@ -360,6 +358,8 @@ if(STATIC)
Qt5ServiceSupport
Qt5GlxSupport
)
elseif(MINGW)
list(APPEND QT5_INTEGRATION_LIBRARIES_LIST qtfreetype)
endif()
foreach(LIBRARY ${QT5_INTEGRATION_LIBRARIES_LIST})