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

CREATE_PROJECT: Fix feature name for freetype #3649

Merged
merged 1 commit into from Jan 9, 2022

Conversation

@henke37
Copy link
Contributor

@henke37 henke37 commented Jan 6, 2022

The feature name was inconsistent with the main build system.

devtools/create_project/cmake.cpp Outdated Show resolved Hide resolved
devtools/create_project/msvc.cpp Outdated Show resolved Hide resolved
@henke37 henke37 force-pushed the freetypeNameFix branch from dc907c1 to 0a6f0f3 Jan 6, 2022
The name was inconsistent with the main build system
@henke37 henke37 force-pushed the freetypeNameFix branch from 0a6f0f3 to b089188 Jan 7, 2022
Copy link
Member

@bluegr bluegr left a comment

I don't see the benefit of this. Not all feature flags match 100% the library names. For zlib <-> libz, the change did make sense, but here, there's very little gain - unless we decide to match all of the library names with the feature flags.

For example, we got pairs such as faad/faad2, tremor/vorbisidec, theora/theoradec, sdlnet/SDL2_net, and theora/USE_THEORADEC, sdlnet/USE_SDL_NET, 16bit/USE_RGB_COLOR, opengles2/USE_GLES2, dialogs/USE_SYSDIALOGS

@henke37
Copy link
Contributor Author

@henke37 henke37 commented Jan 7, 2022

What matters here is that all parts of the build system agree on what the feature is called. Otherwise the dependencies between engines and features don't work correctly.

bluegr
bluegr approved these changes Jan 9, 2022
@bluegr
Copy link
Member

@bluegr bluegr commented Jan 9, 2022

After a discussion with @lephilousophe, this is OK to be merged. Thanks for fixing the inconsistency between the feature flags of create_project and configure

@bluegr bluegr merged commit 8119ae1 into scummvm:master Jan 9, 2022
8 checks passed
@lephilousophe
Copy link
Member

@lephilousophe lephilousophe commented Jan 9, 2022

And I pushed another fix for theoradec and a warning to avoid having these errors for too long.

@henke37 henke37 deleted the freetypeNameFix branch Jan 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants