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

msdfgen: Sync with upstream 1.10 #77959

Merged
merged 1 commit into from
Jun 7, 2023

Conversation

akien-mga
Copy link
Member

No real change, just keeping us in sync with the latest tagged release.

@bruvzg
Copy link
Member

bruvzg commented Jun 7, 2023

Seems like MSDFGEN_PUBLIC is defined as a build option in cmake script, so env_msdfgen.Append(CPPDEFINES=["MSDFGEN_PUBLIC"]) should be added to SCsub.

@akien-mga akien-mga force-pushed the msdfgen-1.10 branch 2 times, most recently from f540388 to f31f010 Compare June 7, 2023 13:51
@AThousandShips
Copy link
Member

Alternatively add:

#ifndef MSDFGEN_PUBLIC
#define MSDFGEN_PUBLIC
#endif

To the generator-config.h file as the upstream has in latest version

@akien-mga
Copy link
Member Author

Nice, did that change. I didn't add a patch file because this change will be included next time we sync with upstream anyway.

@akien-mga akien-mga merged commit 285fbcc into godotengine:master Jun 7, 2023
@akien-mga akien-mga deleted the msdfgen-1.10 branch June 7, 2023 15:33
@YuriSizov
Copy link
Contributor

Cherry-picked for 4.0.4.

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

Successfully merging this pull request may close these issues.

4 participants