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

meson: refactor #1172

Merged
merged 2 commits into from
Mar 9, 2024
Merged

meson: refactor #1172

merged 2 commits into from
Mar 9, 2024

Conversation

izarif
Copy link
Contributor

@izarif izarif commented Mar 1, 2024

Checklist

  • I have read the coding conventions
  • I have added a changelog entry about what my pull request accomplishes, or it is an internal change

Description

Minor code cleanup
Removed unnecessary dependencies
The dependency call for libbacktrace has been replaced by find_library because libbacktrace does not have a pc file

Successfully built a static binary using msys2 mingw

@eikehein
Copy link
Contributor

eikehein commented Mar 1, 2024

Thanks for the PR, this looks quite good.

I'm curious why you removed the explicit warning_level though. Did you run into issues in the msys2 environment?

@walkawayy walkawayy requested review from rr- and walkawayy March 1, 2024 23:34
@walkawayy walkawayy added the Internal The invisible stuff label Mar 1, 2024
Copy link
Collaborator

@walkawayy walkawayy left a comment

Choose a reason for hiding this comment

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

Looks good to me and builds fine on Windows 11 WSL. I'll leave final approval up to @rr- though.

@izarif
Copy link
Contributor Author

izarif commented Mar 2, 2024

I'm curious why you removed the explicit warning_level though. Did you run into issues in the msys2 environment?

No, but warning_level is also set in default_options

@izarif
Copy link
Contributor Author

izarif commented Mar 4, 2024

Sorry for force push, i put zlib back in the dependency list because it is needed for non-static build

@eikehein
Copy link
Contributor

eikehein commented Mar 4, 2024

No, but warning_level is also set in default_options

Right, but it's set to 1: https://mesonbuild.com/Builtin-options.html#core-options

TR1X had it (presumably intentionally) set to a stricter 3: https://mesonbuild.com/Builtin-options.html#details-for-warning_level

@izarif
Copy link
Contributor Author

izarif commented Mar 4, 2024

No, but warning_level is also set in default_options

Right, but it's set to 1: https://mesonbuild.com/Builtin-options.html#core-options

Looks like warning_level is set twice

https://github.com/LostArtefacts/TR1X/blob/develop/meson.build#L4

and

https://github.com/LostArtefacts/TR1X/blob/develop/meson.build#L8

I removed the second assignment
The value of warning_level should now be 2

Or maybe I misunderstood something?

@eikehein
Copy link
Contributor

eikehein commented Mar 4, 2024

Ah, gotcha. No, I only saw you removing that line, and hadn't caught that it was set twice. In that case I agree this is a nice clean-up, although @rr- should probably re-visit whether he wants it to be 2 or 3.

Thumbs up from my side.

Copy link
Collaborator

@rr- rr- left a comment

Choose a reason for hiding this comment

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

Hi, the newest version doesn't build for me because M_PI is undefined on either Linux or Windows.

@izarif
Copy link
Contributor Author

izarif commented Mar 8, 2024

Hi, the newest version doesn't build for me because M_PI is undefined on either Linux or Windows.

I've merged the changes from the develop branch and now it should build without errors

@rr- rr- merged commit 4de8c65 into LostArtefacts:develop Mar 9, 2024
1 check passed
@rr-
Copy link
Collaborator

rr- commented Mar 9, 2024

Thanks for the cleanup.

@izarif izarif deleted the fd4f42b2 branch March 9, 2024 19:46
@walkawayy walkawayy added this to the 4.0 milestone Apr 9, 2024
@rr- rr- added the TR1 label Oct 3, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Internal The invisible stuff TR1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants