Skip to content

Commit e07d8a4

Browse files
authored
[Windows] Move to Visual Studio 2019 (flutter#37013)
Use Visual Studio 2019 to build the engine. This is a requirement to roll ANGLE as it is affected by an STL bug if built using Visual Studio 2017: [angleproject#7693](https://bugs.chromium.org/p/angleproject/issues/detail?id=7693) Depends on: flutter/buildroot#643 Part of: flutter/flutter#110948
1 parent 705939b commit e07d8a4

File tree

3 files changed

+14
-2
lines changed

3 files changed

+14
-2
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ allowed_hosts = [
113113
]
114114

115115
deps = {
116-
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'a680bb1c63e6ae1831cb672db029e9842ec4b905',
116+
'src': 'https://github.com/flutter/buildroot.git' + '@' + 'ad96f00615dc306c22cc09d433eee50392f8033c',
117117

118118
# Fuchsia compatibility
119119
#

shell/platform/windows/window_proc_delegate_manager_unittests.cc

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,18 @@ namespace testing {
1010

1111
namespace {
1212

13+
#ifdef _WIN32
14+
#define FLUTTER_NOINLINE __declspec(noinline)
15+
#else
16+
#define FLUTTER_NOINLINE __attribute__((noinline))
17+
#endif
18+
1319
using TestWindowProcDelegate = std::function<std::optional<
1420
LRESULT>(HWND hwnd, UINT message, WPARAM wparam, LPARAM lparam)>;
1521

1622
// A FlutterDesktopWindowProcCallback that forwards to a std::function provided
1723
// as user_data.
24+
FLUTTER_NOINLINE
1825
bool TestWindowProcCallback(HWND hwnd,
1926
UINT message,
2027
WPARAM wparam,

tools/dia_dll.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,12 @@ def GetDiaDll():
4444
msvs_version = vs_toolchain.GetVisualStudioVersion()
4545

4646
if bool(int(os.environ.get('DEPOT_TOOLS_WIN_TOOLCHAIN', '1'))):
47-
dia_path = os.path.join(win_sdk_dir, '..', 'DIA SDK', 'bin', 'amd64')
47+
# Depot tools .zip layout:
48+
# \- DIA SDK
49+
# \- Windows Kits
50+
# \- 10
51+
# \- ... # Location of `DEPOT_TOOLS_WIN_TOOLCHAIN`
52+
dia_path = os.path.join(win_sdk_dir, '..', '..', 'DIA SDK', 'bin', 'amd64')
4853
else:
4954
if 'GYP_MSVS_OVERRIDE_PATH' in os.environ:
5055
vs_path = os.environ['GYP_MSVS_OVERRIDE_PATH']

0 commit comments

Comments
 (0)