lower compiler version for win7

smanolloff · smanolloff · commit 25f8e1ce13e9 · 2025-11-26T02:03:46.000+02:00
diff --git a/.github/workflows/rebuildDependencies.yml b/.github/workflows/rebuildDependencies.yml
@@ -1,6 +1,9 @@
 name: VCMI - dependencies
 
 on:
+  push:
+    branches:
+      - mmai-tmp
   pull_request:
     paths-ignore:
       - README.md
diff --git a/conan_profiles/base/msvc b/conan_profiles/base/msvc
@@ -6,7 +6,6 @@ include(common)
 compiler=msvc
 compiler.cppstd={{ vars.cppstd }}
 compiler.runtime=dynamic
-compiler.version=194
 os=Windows
 
 [options]
diff --git a/conan_profiles/base/msvc-intel b/conan_profiles/base/msvc-intel
diff --git a/conan_profiles/base/msvc-win7 b/conan_profiles/base/msvc-win7
@@ -1,4 +1,17 @@
+include(msvc)
+
+[settings]
+# https://blog.knatten.org/2022/08/26/microsoft-c-versions-explained/
+# https://learn.microsoft.com/en-us/cpp/overview/compiler-versions
+# https://github.com/actions/runner-images/blob/win25/20251102.77/images/windows/Windows2025-Readme.md#microsoft-visual-c
+# v142 / 14.29 / 19.29
+compiler.version=192
+compiler.update=9
+
 [conf]
+# VS 2022
+tools.microsoft.msbuild:vs_version=17
+
 # https://walbourn.github.io/a-brief-history-of-windows-sdks/
 # https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
 # https://learn.microsoft.com/en-us/windows/win32/WinProg/using-the-windows-headers
diff --git a/conan_profiles/base/msvc-win8 b/conan_profiles/base/msvc-win8
@@ -1,4 +1,17 @@
+include(msvc)
+
+[settings]
+# https://blog.knatten.org/2022/08/26/microsoft-c-versions-explained/
+# https://learn.microsoft.com/en-us/cpp/overview/compiler-versions
+# https://github.com/actions/runner-images/blob/win25/20251102.77/images/windows/Windows2025-Readme.md#microsoft-visual-c
+# v144 / 14.44 / 19.44
+compiler.version=194
+compiler.update=4
+
 [conf]
+# VS 2022
+tools.microsoft.msbuild:vs_version=17
+
 # https://walbourn.github.io/a-brief-history-of-windows-sdks/
 # https://learn.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
 # https://learn.microsoft.com/en-us/windows/win32/WinProg/using-the-windows-headers
diff --git a/conan_profiles/msvc-arm64 b/conan_profiles/msvc-arm64
@@ -1,4 +1,4 @@
-include(base/msvc)
+include(base/msvc-win8)
 
 [settings]
 arch=armv8
diff --git a/conan_profiles/msvc-x64 b/conan_profiles/msvc-x64
@@ -1,4 +1,3 @@
-include(base/msvc-intel)
 include(base/msvc-win8)
 
 [settings]
diff --git a/conan_profiles/msvc-x64-win7 b/conan_profiles/msvc-x64-win7
@@ -1,4 +1,3 @@
-include(base/msvc-intel)
 include(base/msvc-win7)
 
 [settings]
diff --git a/conan_profiles/msvc-x86 b/conan_profiles/msvc-x86
@@ -1,4 +1,3 @@
-include(base/msvc-intel)
 include(base/msvc-win8)
 
 [settings]
diff --git a/conan_profiles/msvc-x86-win7 b/conan_profiles/msvc-x86-win7
@@ -1,4 +1,3 @@
-include(base/msvc-intel)
 include(base/msvc-win7)
 
 [settings]

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-include(base/msvc)`
	`1`	`+include(base/msvc-win8)`
`2`	`2`
`3`	`3`	`[settings]`
`4`	`4`	`arch=armv8`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-include(base/msvc-intel)`
`2`	`1`	`include(base/msvc-win8)`
`3`	`2`
`4`	`3`	`[settings]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-include(base/msvc-intel)`
`2`	`1`	`include(base/msvc-win7)`
`3`	`2`
`4`	`3`	`[settings]`