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

Switch to CMake #10

Merged
merged 21 commits into from Mar 10, 2021
Merged

Switch to CMake #10

merged 21 commits into from Mar 10, 2021

Conversation

glx22
Copy link
Contributor

@glx22 glx22 commented Dec 14, 2020

This is based on @PeterN cmake branch.
I added MinGW and MSVC support, and done some cleaning.

TrueBrain
TrueBrain previously approved these changes Dec 14, 2020
Copy link
Member

@TrueBrain TrueBrain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I tried to find something to complain about, but I cannot.

It compiles for me.
It compiles for you.

Ship it!

(really, this is too big to really evaluate, and it looks fine on the surface, you are a smart guy, I think we will be fine :D)

TrueBrain
TrueBrain previously approved these changes Dec 15, 2020
Copy link
Member

@TrueBrain TrueBrain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still going to YOLO this as .. yeah, I love that you took the effort :D

@glx22
Copy link
Contributor Author

glx22 commented Dec 18, 2020

When testing glx22#2 I found some issues in this PR.

@Eddi-z
Copy link

Eddi-z commented Jan 15, 2021

Seems to work for me, needs updates to readme.txt, 0compile.txt and .gitignore

@TrueBrain
Copy link
Member

I see you never accepted any of my approvals :P Rebase, and try again? :D

@glx22 glx22 merged commit fe2970d into OpenTTD:master Mar 10, 2021
@glx22 glx22 deleted the cmake_fixes branch March 10, 2021 16:22
@matthijskooijman
Copy link
Contributor

When switching to cmake, the documentation (0compile.txt) was not updated and still references the plain Makefile targets. Maybe it should be updated? It should probably also mention that, for a release build, you should run cmake . -DCMAKE_BUILD_TYPE=Release (without that, you get a debug build without optimizations), or the default build type could be made release maybe.

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

5 participants