Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Adjust the GLFW build options #17704

Merged

Conversation

stuartmorgan-g
Copy link
Contributor

  • Adds an explicit option for not building the GLFW embedding.
  • Disables GLFW by default on Windows, where it's no longer the
    uploaded embedding.
  • Move the X11 pkg-config, which is only used by the GLFW embedding,
    behind the GLFW build flag.

- Adds an explicit option for not building the GLFW embedding.
- Disables GLFW by default on Windows, where it's no longer the
  uploaded embedding.
- Move the X11 pkg-config, which is only used by the GLFW embedding,
  behind the GLFW build flag.
@@ -340,8 +339,10 @@ def parse_args(args):
help='The IDE files to generate using GN. Use `gn gen help` and look for the --ide flag to' +
' see supported IDEs. If this flag is not specified, a platform specific default is selected.')

parser.add_argument('--build-glfw-shell', dest='build_glfw_shell', default=False, action='store_true',
help='Force building the GLFW shell on desktop platforms where it is not built by default.')
parser.add_argument('--build-glfw-shell', action='store_const', const=True,
Copy link
Member

Choose a reason for hiding this comment

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

I thought argparse implicitly added a no- flag variant?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm definitely not an argparse expert, but we're manually adding no- for stripped below already, and some quick searching turns up SO questions suggesting that it doesn't.

Copy link
Member

Choose a reason for hiding this comment

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

I am not sure either, but if this pattern has been followed before, thats fine by me (I did not notice it in the initial review).

@@ -340,8 +339,10 @@ def parse_args(args):
help='The IDE files to generate using GN. Use `gn gen help` and look for the --ide flag to' +
' see supported IDEs. If this flag is not specified, a platform specific default is selected.')

parser.add_argument('--build-glfw-shell', dest='build_glfw_shell', default=False, action='store_true',
help='Force building the GLFW shell on desktop platforms where it is not built by default.')
parser.add_argument('--build-glfw-shell', action='store_const', const=True,
Copy link
Member

Choose a reason for hiding this comment

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

I am not sure either, but if this pattern has been followed before, thats fine by me (I did not notice it in the initial review).

@stuartmorgan-g stuartmorgan-g merged commit dfe1378 into flutter:master Apr 14, 2020
@stuartmorgan-g stuartmorgan-g deleted the glfw-build-adjustments branch April 14, 2020 19:45
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 14, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 14, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 14, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 15, 2020
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 15, 2020
goderbauer pushed a commit to goderbauer/engine that referenced this pull request Apr 16, 2020
- Adds an explicit option for not building the GLFW embedding.
- Disables GLFW by default on Windows, where it's no longer the
  uploaded embedding.
- Moves the X11 pkg-config, which is only used by the GLFW embedding,
  behind the GLFW build flag.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants