DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adjust the GLFW build options (#17704)

Browse Source 
- 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.
This commit is contained in:
stuartmorgan 2020-04-14 12:45:21 -07:00 committed by GitHub
parent e8d71b4d2f
commit dfe13788ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/platform/glfw/config.gni
View File

@ -9,5 +9,5 @@ declare_args() {
# but it can be enabled for supported platforms (Windows, macOS, and Linux)
# as an extra build artifact with this flag. The native toolkit shell will
# still be built as well.
build_glfw_shell = (is_linux || is_win) && current_toolchain == host_toolchain
build_glfw_shell = is_linux && current_toolchain == host_toolchain
}

7
shell/platform/linux/config/BUILD.gn
View File

@ -3,9 +3,12 @@
# found in the LICENSE file.
import("//build/config/linux/pkg_config.gni")
import("//flutter/shell/platform/glfw/config.gni")
pkg_config("x11") {
packages = [ "x11" ]
if (build_glfw_shell) {
pkg_config("x11") {
packages = [ "x11" ]
}
}
pkg_config("gtk") {

11
tools/gn
View File

@ -250,9 +250,8 @@ def to_gn_args(args):
gn_args['dart_platform_sdk'] = not args.full_dart_sdk
gn_args['full_dart_sdk'] = args.full_dart_sdk
if sys.platform == 'darwin':
if args.build_glfw_shell:
gn_args['build_glfw_shell'] = True
if args.build_glfw_shell is not None:
gn_args['build_glfw_shell'] = args.build_glfw_shell
gn_args['stripped_symbols'] = args.stripped
@ -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,
help='Build the GLFW shell on supported platforms where it is not built by default.')
parser.add_argument('--no-build-glfw-shell', dest='build_glfw_shell', action='store_const', const=False,
help='Do not build the GLFW shell on platforms where it is built by default.')
parser.add_argument('--bitcode', default=False, action='store_true',
help='Enable bitcode for iOS targets. On debug runtime modes, this will be a marker only.')