From 351f7421838a3ed12d44e1bd07fdc66596cf9010 Mon Sep 17 00:00:00 2001 From: Cheng Date: Thu, 22 Feb 2024 21:21:53 +0000 Subject: [PATCH] synchronous change in master project and wxWidgets submodule --- msvc/wx_cmake_Debug.bat | 2 +- msvc/wx_cmake_Release.bat | 2 +- wxWidgets | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/msvc/wx_cmake_Debug.bat b/msvc/wx_cmake_Debug.bat index f59907d..6860e03 100644 --- a/msvc/wx_cmake_Debug.bat +++ b/msvc/wx_cmake_Debug.bat @@ -19,7 +19,7 @@ rem cd .. rem PAUSE cd wxWidgets -cmake . -Bbuild\msw\vc_x64_mswu -DwxBUILD_SHARED=OFF -DwxBUILD_TESTS=OFF -DwxBUILD_SAMPLES=OFF -DwxUSE_ACCESSIBILITY=OFF -DwxUSE_UNSAFE_WXSTRING_CONV=ON -DwxUSE_COMPILER_TLS=2 +cmake . -Bbuild\msw\vc_x64_mswu echo off IF %ERRORLEVEL% NEQ 0 ( echo Failed during cmake create build directory diff --git a/msvc/wx_cmake_Release.bat b/msvc/wx_cmake_Release.bat index f49f628..169e418 100644 --- a/msvc/wx_cmake_Release.bat +++ b/msvc/wx_cmake_Release.bat @@ -20,7 +20,7 @@ rem cd .. rem PAUSE cd wxWidgets -cmake -DwxBUILD_SHARED=OFF -DwxBUILD_TESTS=OFF -DwxBUILD_SAMPLES=OFF -DwxUSE_ACCESSIBILITY=OFF . -Bbuild\msw\vc_x64_mswu +cmake . -Bbuild\msw\vc_x64_mswu echo off IF %ERRORLEVEL% NEQ 0 ( echo Failed during cmake create build directory diff --git a/wxWidgets b/wxWidgets index cb9a793..8037402 160000 --- a/wxWidgets +++ b/wxWidgets @@ -1 +1 @@ -Subproject commit cb9a793248e34926e5928e5254010141620009ea +Subproject commit 8037402f847136a279e80f3813113aad7fac506f