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

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
+1,124 −1,114

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
View reviewed changes
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
View reviewed changes
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.

PeterN and others added 21 commits December 21, 2020 23:10
@PeterN @glx22
Fix: Don't use register modifier.
c1e9a55
@PeterN @glx22
Remove: Autogenerated file.
2f1b9eb
@PeterN @glx22
Change: Use cstdint types
39ba5a5
@PeterN @glx22
Change: Always include path.h
d0db325
@PeterN @glx22
Change: Switch to CMake
5e91d0d
@PeterN @glx22
Fix: leftover endian.h
816d4b2
@PeterN @glx22
Change: generate version.h instead of using parameter defines
c415301
@PeterN @glx22
Remove: comments
cb884c1
@PeterN @glx22
Change: else()/endif() cleanup
93e1a21
@glx22
Fix: typo
b98235b
@glx22
Fix: incorrect compiler defines
fe9b196
@glx22
Change: replace perl with cmake to generate ttdpal.h
ddf2cbc
@glx22
Change: force static linking for MinGW builds
5e3398c
@glx22
Revert 8d065f6: our own getopt is needed for MSVC
acc98ab
@glx22
Fix: missing include for std::min and std::max
8f9c2ec
@glx22
Fix: name conflict with std::data (c++17)
3c2cf6d
@glx22
Add: compilation with MSVC
8ae5a6e
@glx22
Fix: MSVC warnings
ba8a4b4
@glx22
Change: use a CMakeLists.txt file per directory
aa94257
@glx22
Fix: restore compile flags
7eb5016
@glx22
Fix: restore fmemopen detection
26f6225
@Eddi-z
Copy link

Eddi-z commented Jan 15, 2021 •
edited
Loading

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
@glx22 glx22 mentioned this pull request Mar 10, 2021
Closed
@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.

Sorry, something went wrong.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TrueBrain TrueBrain

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@glx22 @Eddi-z @TrueBrain @matthijskooijman @PeterN