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

Change Linux font path if required #35

Merged
merged 7 commits into from
May 16, 2017
Merged

Conversation

rgiot
Copy link
Contributor

@rgiot rgiot commented May 1, 2017

Under Linux, Bonzomatic wants to use the following font /usr/share/fonts/corefonts/cour.ttf.
It seems its installation path depends in not stable over distributions/versions.
This patch use the font /usr/share/fonts/truetype/msttcorefonts/cour.ttf if the initial one does not exist

@Gargaj
Copy link
Owner

Gargaj commented May 1, 2017

Wouldn't it make more sense to do the detection in code, not in CMAKE?

@rgiot
Copy link
Contributor Author

rgiot commented May 1, 2017

Indeed, it is probably more coherent to make the detection code in the main file

@rgiot
Copy link
Contributor Author

rgiot commented May 1, 2017

@Gargaj ok, I have transfered the font choice from the cmake to the executable. I can still modify it if it does not fit your coding standards

@Gargaj
Copy link
Owner

Gargaj commented May 2, 2017

Is there no way to do it without that #include-pyramid at the start? Also, why is the 64-bit build excluded?

@rgiot
Copy link
Contributor Author

rgiot commented May 14, 2017

I've removed all the ifdef stuff ; I guess I excluded 64bits after misinterpreting error messages generated by the continuous integration tools

@Gargaj Gargaj merged commit 4658d36 into Gargaj:master May 16, 2017
@Gargaj
Copy link
Owner

Gargaj commented May 16, 2017

Looks good now thanks (shame about the extra whitespace but I'd be awfully pedantic if I'd force you to change that :)

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.

2 participants