Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[angle] Fix mingw build #19307

Merged
merged 3 commits into from
Aug 19, 2021
Merged

[angle] Fix mingw build #19307

merged 3 commits into from
Aug 19, 2021

Conversation

dg0yt
Copy link
Contributor

@dg0yt dg0yt commented Aug 2, 2021

  • What does your PR fix?

    • Fixes dulicate "lib" in name of import libs for libEGL and libGLESv2.
    • Fixes building with mingw.
  • Which triplets are supported/not supported? Have you updated the CI baseline?

    no change, no.

  • Does your PR follow the maintainer guide?

    yes

  • If you have added/updated a port: Have you run ./vcpkg x-add-version --all and committed the result?

    yes


Disclaimer: not tested with actual app, just another step towards building Qt.

@dg0yt
Copy link
Contributor Author

dg0yt commented Aug 2, 2021

qt5-base doesn't use angle on windows?!

@PhoebeHui PhoebeHui added the category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist label Aug 3, 2021
SET_TARGET_PROPERTIES(libANGLE PROPERTIES PREFIX "")
SET_TARGET_PROPERTIES(libGLESv2 PROPERTIES PREFIX "")
SET_TARGET_PROPERTIES(libEGL PROPERTIES PREFIX "")
set_target_properties(libANGLE PROPERTIES PREFIX "")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't libANGLE be given a similar IMPORT_PREFIX ""?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

libANGLE is STATIC so there is no import library:

add_library(libANGLE STATIC ${LIBANGLE_SOURCES})

@dg0yt
Copy link
Contributor Author

dg0yt commented Aug 3, 2021

qt5-base doesn't use angle on windows?!

@ras0219 Do you have an idea why it is not supported for windows?

"dependencies": [
{
"name": "angle",
"platform": "!windows"
},

@Neumann-A
Copy link
Contributor

@ras0219 Do you have an idea why it is not supported for windows?

on windows the default is always to use -opengl dynamic even for static builds so angle is not required for windows. (see https://doc.qt.io/qt-5/windows-requirements.html.)
angle also has been completely removed from Qt6. It is a completely optional runtime dependency which nowadays can commonly be replaced by the normal windows opengl driver. Alternatively software rendering via mesa would also be possible.

@PhoebeHui PhoebeHui added the info:reviewed Pull Request changes follow basic guidelines label Aug 6, 2021
@dan-shaw dan-shaw merged commit a9613b5 into microsoft:master Aug 19, 2021
@dg0yt dg0yt deleted the angle-import-libs branch September 5, 2021 05:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:reviewed Pull Request changes follow basic guidelines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants