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

fix(thorvg): fix windows build break #5978

Merged
merged 1 commit into from
Apr 3, 2024

Conversation

liamHowatt
Copy link
Collaborator

@liamHowatt liamHowatt commented Mar 27, 2024

Description of the feature or fix

In response to #5946

Error when building thorvg on Windows. Defined functions were being marked with __declspec(dllimport).

#ifdef _WIN32
#if TVG_BUILD
#define TVG_API __declspec(dllexport)
#else
#define TVG_API __declspec(dllimport)
#endif

This fix tries to leave the thorvg header untouched except for defining TVG_BUILD at the top so it's easier to update thorvg from the upstream. #4691 (comment)

Would have been found by the eventual Windows CI #5904

Also remove duplicate guard.

Notes

Copy link
Member

@kisvegabor kisvegabor left a comment

Choose a reason for hiding this comment

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

Having a Windows build test would be really great.. (#5904)

@liamHowatt do you feel the power to add a Windows build test to the CI?

@FASTSHIFT FASTSHIFT changed the title fix(thorvg): Windows build fix(thorvg): fix windows build break Mar 29, 2024
@liamHowatt
Copy link
Collaborator Author

liamHowatt commented Mar 29, 2024

@liamHowatt do you feel the power to add a Windows build test to the CI?

After some brief exploration I think I have the power to do it. It was easy enough to use the windows-latest runner. It comes with MinGW GCC and the chocolatey package manager and many more things we can use to make it happen.

Here's everything that comes with the windows runner: https://github.com/actions/runner-images/blob/win22/20240322.1/images/windows/Windows2022-Readme.md

My branch is https://github.com/liamHowatt/lvgl/tree/feat/windows-ci

@liamHowatt
Copy link
Collaborator Author

Oh, hang on, I'll verify MinGW GCC treats everything the same as MSVC. I know that MinGW GCC defines _WIN32. But I'll need to see about #5873. No matter either way. Visual Studio is also installed in the runner.

@kisvegabor
Copy link
Member

I think MSVC is the real issue and focus on that.

@kisvegabor kisvegabor merged commit 4fcf708 into lvgl:master Apr 3, 2024
16 checks passed
@liamHowatt
Copy link
Collaborator Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants