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.

Sign up for GitHub

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

Jump to bottom

Remove xCGUITTFont.cpp and xCGUITTFont.h wrapper files #1699

Closed
wants to merge 1 commit into from
Closed

Remove xCGUITTFont.cpp and xCGUITTFont.h wrapper files #1699

wants to merge 1 commit into from

Conversation

kahrl
Copy link
Contributor

@kahrl kahrl commented Sep 28, 2014

They were an attempt to avoid modifying CGUITTFont.cpp/CGUITTFont.h,
an attempt which clearly failed.

@kahrl kahrl added the Maintenance Tasks to keep the codebase and related parts in order, including architectural improvements label Sep 28, 2014
@BlockMen
Copy link
Contributor

BlockMen commented Oct 2, 2014

Am I wrong, or does it need to be changed here aswell?

minetest/build/android/jni/Android.mk

Line 251 in d790aca

jni/src/cguittfont/xCGUITTFont.cpp

@kahrl
Remove xCGUITTFont.cpp and xCGUITTFont.h wrapper files
278b83c 
They were an attempt to avoid modifying CGUITTFont.cpp/CGUITTFont.h,
an attempt which clearly failed.
@kahrl kahrl force-pushed the remove_xcguittfont_wrapper branch from 31a7e5f to 278b83c Compare October 4, 2014 01:28
@kahrl
Copy link
Contributor Author

kahrl commented Oct 4, 2014

You are right of course.
I wasn't aware that the android build didn't reuse the source list from the normal CMakeLists.txt.

@ghost
Copy link

ghost commented Oct 4, 2014

Probably a good idea, incompatible with #1636

@ShadowNinja ShadowNinja added the @ Build CMake, build scripts, official builds, compiler and linker errors label Oct 5, 2014
@Calinou
Copy link
Member

Calinou commented Oct 7, 2014

Probably a good idea, incompatible with #1636

#1636 needs rebase anyway.

@paramat paramat added the Rebase needed The PR needs to be rebased by its author. label May 22, 2016
@paramat
Copy link
Contributor

paramat commented May 22, 2016 •
edited

@kahrl old PR, no activity for a year, needs rebasing.

@kahrl
Copy link
Contributor Author

kahrl commented May 28, 2016

Not important enough to warrant spending effort to rebase it. Closing.

@kahrl kahrl closed this May 28, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
@ Build CMake, build scripts, official builds, compiler and linker errors Maintenance Tasks to keep the codebase and related parts in order, including architectural improvements Rebase needed The PR needs to be rebased by its author.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@kahrl @BlockMen @Calinou @paramat @ShadowNinja