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

Fix platform selection, custom tools overrides, and user overrides of use_mingw #81700

Open
wants to merge 3 commits into
base: master
Choose a base branch
from

Commits on Oct 12, 2023

  1. Fix platform/target selection, let platforms override custom tools, o…

    …bey overrides of use_mingw
    
    Let the platforms optionally override the default scons environment tools
    via a `custom_tools` flag, so the default SConstruct only needs to set the
    defaults and not worry about each individual platform requirements.
    Users can also override the tools via `custom_tools`.
    
    Add a temporary SCons environment to only process `use_mingw`, `platform`,
    `target` and `custom_tools` options from all the different places where
    they can be set, and then use those values to initialize the actual
    environment that we use to build, as well as determine which builder scripts
    to load based on the target.
    
    This fixes a related issue where, if a platform sets a default target
    in `get_flags` different from editor, and the user doesn't pass in the
    target in the command line, the `editor` target would be briefly selected
    during a portion of SConstruct execution, long enough to set the
    env.editor_build to true, causing editor files and defines to be set
    for non-editor builds.
    
    Fixes godotengine#60719
    shana committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    042d297 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Distinguish between default values and user-set values

    Make sure that if the user sets a value equal to the default and the
    platform sets a value different from the default, that the user value
    is respected.
    shana committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    6f533f0 View commit details
    Browse the repository at this point in the history
  2. Fix formatting

    shana committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    9845f28 View commit details
    Browse the repository at this point in the history