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

Add option to use system FreeType (2.1) #2915

Merged
merged 1 commit into from Dec 20, 2016
Merged

Add option to use system FreeType (2.1) #2915

merged 1 commit into from Dec 20, 2016

Conversation

Qantas94Heavy
Copy link
Contributor

This pull request supersedes #2914.

MuseScore 2.0.3 uses a bundled version of FreeType without having an
option to go back to using the system version of FreeType. This commit
conditionally reverts this change if USE_SYSTEM_FREETYPE is enabled.

Indentation is also fixed to be consistent within the files.

NOTE: given that there will likely be changes to the build system for 3.0 I have not submitted this to master but the 2.1 branch only.

@Qantas94Heavy Qantas94Heavy changed the title Add option to use system FreeType Add option to use system FreeType (2.1) Dec 19, 2016
MuseScore 2.0.3 uses a bundled version of FreeType without having an
option to go back to using the system version of FreeType. This commit
conditionally reverts this change if USE_SYSTEM_FREETYPE is enabled.

Indentation is also fixed to be consistent within the files.
@lasconic lasconic merged commit e04fa0b into musescore:2.1 Dec 20, 2016
lasconic added a commit that referenced this pull request Dec 20, 2016
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

2 participants