Bump minimum WinAPI target to Vista

rdipardo · Dec 21, 2024 · f8bfd81 · f8bfd81
1 parent 55d5d22
commit f8bfd81
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -43,14 +43,6 @@ jobs:
             refreshenv
             python -m pip install cmake~=3.30.0
             cmake --version
-      - run:
-         name: Install the v141_xp VC toolset
-         command: |
-           cd "C:\Program Files (x86)\Microsoft Visual Studio\Installer"
-           .\vs_installer.exe modify --installPath "C:\Program Files\Microsoft Visual Studio\2022\Community" `
-            --add Microsoft.VisualStudio.Component.VC.v141.x86.x64 `
-            --add Microsoft.VisualStudio.Component.WinXP `
-            --downloadThenInstall --quiet
       - run:
          name: Build and Pack
          command: make_release.cmd

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -7,8 +7,8 @@
 		"NOMINMAX",
 		"_CRT_SECURE_NO_WARNINGS",
 		"_USING_V110_SDK71_",
-		"_WIN32_WINNT=_WIN32_WINNT_WINXP",
-		"NTDDI_VERSION=NTDDI_WINXPSP3"
+		"_WIN32_WINNT=_WIN32_WINNT_VISTA",
+		"NTDDI_VERSION=NTDDI_VISTASP1"
 	],
 	"C_Cpp.autoAddFileAssociations": false,
 	"C_Cpp.codeAnalysis.runAutomatically": false

diff --git a/src/Forms/resource.h b/src/Forms/resource.h
@@ -10,8 +10,8 @@
 
 #include <windows.h>
 
-#define HTMLTAG_VERSION L"1.5.1.4\0"
-#define HTMLTAG_VERSION_WORDS 1, 5, 1, 4
+#define HTMLTAG_VERSION L"1.5.1.5\0"
+#define HTMLTAG_VERSION_WORDS 1, 5, 1, 5
 
 #define ID_ABOUT_HTML_TAG_DLG 0x1000
 #define ID_UNICODE_FMT_CONFIG_DLG 0x2000

diff --git a/src/prj/CMakeLists.txt b/src/prj/CMakeLists.txt
@@ -123,12 +123,11 @@ if (VC_BUILD)
   if (NOT "${PLATFORM_ID}" MATCHES "arm")
     set_target_properties(${PROJECT_NAME} PROPERTIES
       MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>"
-      VS_PLATFORM_TOOLSET "v141_xp"
     )
     target_compile_definitions (${PROJECT_NAME} PRIVATE
       _USING_V110_SDK71_
-      _WIN32_WINNT=_WIN32_WINNT_WINXP
-      NTDDI_VERSION=NTDDI_WINXPSP3
+      _WIN32_WINNT=_WIN32_WINNT_VISTA
+      NTDDI_VERSION=NTDDI_VISTASP1
     )
   endif ()