Skip to content

Commit cbb96d0

Browse files
authored
[Windows] Move to Visual Studio 2019 (flutter#36538)
1 parent d550da0 commit cbb96d0

File tree

3 files changed

+9
-2
lines changed

3 files changed

+9
-2
lines changed

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ allowed_hosts = [
109109
]
110110

111111
deps = {
112-
'src': 'https://github.com/flutter/buildroot.git' + '@' + '64d07cbd3d9fa0c15f06c8e24c3bdbf5a9a06329',
112+
'src': 'https://github.com/flutter/buildroot.git' + '@' + '24bd842dde44696462562fb02f9e2226f9297d92',
113113

114114
# Fuchsia compatibility
115115
#

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ 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+
dia_path = os.path.join(win_sdk_dir, '..', '..', 'DIA SDK', 'bin', 'amd64')
4848
else:
4949
if 'GYP_MSVS_OVERRIDE_PATH' in os.environ:
5050
vs_path = os.environ['GYP_MSVS_OVERRIDE_PATH']

0 commit comments

Comments
 (0)