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

Misc fixes #178

Merged
merged 3 commits into from
Feb 27, 2021
Merged

Misc fixes #178

merged 3 commits into from
Feb 27, 2021

Conversation

rokups
Copy link
Contributor

@rokups rokups commented Feb 27, 2021

Sorry for moving slow, here are my promised fixes.

  • Fix build on UWP. Aside from this one tiny detail RmlUI works out of the box on UWP! 🥳
  • Fix including extra code using RMLUI_*_USER_EXTRA. Nobody was using it and did not notice that random code in these macros break build because pasting that code within __has_include() is not well-formed.
  • Fix build with EASTL due to undeclared DataModelHandle (wanted by eastl::function).

Apparently nobody was using this feature and did not notice that lots of code in _EXTRA macro does not work with __has_include().
@rokups
Copy link
Contributor Author

rokups commented Feb 27, 2021

Actually do not merge just yet. There will be more like DataModelHandle fix. Waiting for my CI to go green.

@Dakror
Copy link
Contributor

Dakror commented Feb 27, 2021

FYI you can mark you PR as a draft until you're happy with it.

@rokups
Copy link
Contributor Author

rokups commented Feb 27, 2021

Huh how?

@Dakror
Copy link
Contributor

Dakror commented Feb 27, 2021

On the right where you can see assigned, reviewers etc, there's a text-link based button to convert to draft, somewhere

@rokups rokups marked this pull request as draft February 27, 2021 15:43
@rokups
Copy link
Contributor Author

rokups commented Feb 27, 2021

Nice! Thanks 🙏🏻

@mikke89
Copy link
Owner

mikke89 commented Feb 27, 2021

Thanks! I'll wait for your green light then.

I think we're probably going to keep breaking EASTL unless somebody adds it to the CI ;)

@rokups rokups marked this pull request as ready for review February 27, 2021 18:22
@rokups
Copy link
Contributor Author

rokups commented Feb 27, 2021

All good, took me few iterations where to put DataModelHandle include. No worries about breakages ;)

@mikke89 mikke89 added bug Something isn't working enhancement New feature or request labels Feb 27, 2021
@mikke89 mikke89 merged commit 68cffac into mikke89:master Feb 27, 2021
@mikke89
Copy link
Owner

mikke89 commented Feb 27, 2021

Alright, thanks for this! Nice to know it builds on UWP as well now :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants