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

[SCons] Move toolchains logic to tools folder, various improvements. #762

Merged
merged 4 commits into from
Jun 27, 2022

Conversation

Faless
Copy link
Contributor

@Faless Faless commented Jun 8, 2022

In this PR:

  • Fix test gdextension file missing windows 32 bits.
  • Move toolchains logic to tools folder.
  • Add OSXCross support for osx and ios.
  • Add min ios version override.

SConstruct Outdated
Comment on lines 20 to 21
elif sys.platform.startswith("freebsd"):
host_platform = "freebsd"
default_platform = "freebsd"
Copy link
Member

Choose a reason for hiding this comment

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

Should probably be removed as removed further down.

Copy link
Member

@akien-mga akien-mga 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, just a couple improvements to do as we discussed on chat (sync Android with godotengine/godot#61691).

@Faless
Copy link
Contributor Author

Faless commented Jun 27, 2022

Should be good to go once CI passes, note that I have another branch with an extra commit that also refactor "arch" inside the platform tools and move the global options to a godotcpp tool (see https://github.com/Faless/godot-cpp/tree/build/4.x_scons_tools_plus) but it's probably worth doing that in another PR so we can better test it.

@akien-mga akien-mga merged commit 89786cf into godotengine:master Jun 27, 2022
@akien-mga
Copy link
Member

Thanks!

@Faless Faless deleted the build/4.x_scons_tools branch June 27, 2022 19:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
topic:buildsystem Related to the buildsystem or CI setup usability
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants