From c57f883ab1bbc2ee7e1a5ee71850f4a03ee5349a Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Tue, 26 Jul 2022 19:20:41 -0400 Subject: [PATCH 1/2] Update wxWidgets to v3.2.0 (official release) --- ext/wxWidgets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/wxWidgets b/ext/wxWidgets index 8c57b9ad..5b5ec380 160000 --- a/ext/wxWidgets +++ b/ext/wxWidgets @@ -1 +1 @@ -Subproject commit 8c57b9ada4603cd38b9d20bb5fc127826052f131 +Subproject commit 5b5ec3804a31a3765d60ff351bbdf79eddb1e1f9 From aef28b1c575d45eac29a4d360705542a809f7c5a Mon Sep 17 00:00:00 2001 From: Scott Talbert Date: Mon, 1 Aug 2022 10:12:58 -0400 Subject: [PATCH 2/2] Windows CI: add vcvarsall setup to fix Windows builds --- .azure/ci-windows-job.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.azure/ci-windows-job.yml b/.azure/ci-windows-job.yml index 4b614c63..6585e321 100644 --- a/.azure/ci-windows-job.yml +++ b/.azure/ci-windows-job.yml @@ -66,6 +66,13 @@ jobs: python -m pip install -r requirements.txt displayName: 'Install Python dependencies' + - task: BatchScript@1 + displayName: 'Set up vcvarsall' + inputs: + filename: 'C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat' + arguments: $(python.arch) + modifyEnvironment: true + - bash: | python build.py --jobs=4 build_wx displayName: 'build wxWidgets'