OSDN > Entwickler >

fsu0413 > Kammer > Fs-scripts > Commit

fsu0413

Fs-scripts
Fork

(Original-Repository, kein Fork Herkunft)

R/O
HTTP
SSH
HTTPS

Commit

Commit MetaInfo

Revision	06b4308e46665e5314516b52d04b11afcd8db784 (tree)
Zeit	2023-12-02 15:27:38
Autor	Fs <Fsu0413@vip....>
Commiter	Fs

Log Message

又大更啊。。。

Ändern Zusammenfassung

modified: Compile/lib/Configuration.lua (diff)
modified: Compile/lib/mariadbCompile/conf.lua (diff)
modified: Compile/lib/opensslCompile/conf.lua (diff)
modified: Compile/lib/qtCompile/conf.lua (diff)

Diff

--- a/Compile/lib/Configuration.lua

+++ b/Compile/lib/Configuration.lua

		@@ -50,8 +50,8 @@ conf.host.win = {
50	50	["MinGWLLVM-ucrt15-64"] = {"D:\\mingw-w64\\llvm-mingw-20220906-ucrt-x86_64\\x86_64-w64-mingw32\\bin", "D:\\mingw-w64\\llvm-mingw-20220906-ucrt-x86_64\\bin"},
51	51	["MinGWLLVM-msvcrt16-64"] = {"D:\\mingw-w64\\llvm-mingw-20230614-msvcrt-x86_64\\x86_64-w64-mingw32\\bin", "D:\\mingw-w64\\llvm-mingw-20230614-msvcrt-x86_64\\bin"},
52	52	["MinGWLLVM-ucrt16-64"] = {"D:\\mingw-w64\\llvm-mingw-20230614-ucrt-x86_64\\x86_64-w64-mingw32\\bin", "D:\\mingw-w64\\llvm-mingw-20230614-ucrt-x86_64\\bin"},
53		- ["MinGWLLVM-msvcrt17-64"] = {"D:\\mingw-w64\\llvm-mingw-20231003-msvcrt-x86_64\\x86_64-w64-mingw32\\bin", "D:\\mingw-w64\\llvm-mingw-20231003-msvcrt-x86_64\\bin"},
54		- ["MinGWLLVM-ucrt17-64"] = {"D:\\mingw-w64\\llvm-mingw-20231003-ucrt-x86_64\\x86_64-w64-mingw32\\bin", "D:\\mingw-w64\\llvm-mingw-20231003-ucrt-x86_64\\bin"},
	53	+ ["MinGWLLVM-msvcrt17-64"] = {"D:\\mingw-w64\\llvm-mingw-20231128-msvcrt-x86_64\\x86_64-w64-mingw32\\bin", "D:\\mingw-w64\\llvm-mingw-20231128-msvcrt-x86_64\\bin"},
	54	+ ["MinGWLLVM-ucrt17-64"] = {"D:\\mingw-w64\\llvm-mingw-20231128-ucrt-x86_64\\x86_64-w64-mingw32\\bin", "D:\\mingw-w64\\llvm-mingw-20231128-ucrt-x86_64\\bin"},
55	55	},
56	56	["sourcePackagePath"] = "D:\\Qt\\",
57	57	["buildRootPath"] = "D:\\Qt\\", -- On Windows, the build root should be same with source package

		@@ -64,7 +64,7 @@ conf.host.win = {
64	64	["r21e"] = "D:\\android-ndk-r21e",
65	65	["r23c"] = "D:\\android-ndk-r23c",
66	66	["r25c"] = "D:\\android-ndk-r25c",
67		- ["r26"] = "D:\\android-ndk-r26",
	67	+ ["r26b"] = "D:\\android-ndk-r26b",
68	68	},
69	69	["androidNdkHost"] = "windows-x86_64",
70	70	["emscriptenPath"] = {

		@@ -112,15 +112,15 @@ conf.host.msys = {
112	112	["MinGWLLVM-ucrt15-64"] = {"/d/mingw-w64/llvm-mingw-20220906-ucrt-x86_64/x86_64-w64-mingw32/bin", "/d/mingw-w64/llvm-mingw-20220906-ucrt-x86_64/bin"},
113	113	["MinGWLLVM-msvcrt16-64"] = {"/d/mingw-w64/llvm-mingw-20230614-msvcrt-x86_64/x86_64-w64-mingw32/bin", "/d/mingw-w64/llvm-mingw-20230614-msvcrt-x86_64/bin"},
114	114	["MinGWLLVM-ucrt16-64"] = {"/d/mingw-w64/llvm-mingw-20230614-ucrt-x86_64/x86_64-w64-mingw32/bin", "/d/mingw-w64/llvm-mingw-20230614-ucrt-x86_64/bin"},
115		- ["MinGWLLVM-msvcrt17-64"] = {"/d/mingw-w64/llvm-mingw-20231003-msvcrt-x86_64/x86_64-w64-mingw32/bin", "/d/mingw-w64/llvm-mingw-20231003-msvcrt-x86_64/bin"},
116		- ["MinGWLLVM-ucrt17-64"] = {"/d/mingw-w64/llvm-mingw-20231003-ucrt-x86_64/x86_64-w64-mingw32/bin", "/d/mingw-w64/llvm-mingw-20231003-ucrt-x86_64/bin"},
	115	+ ["MinGWLLVM-msvcrt17-64"] = {"/d/mingw-w64/llvm-mingw-20231128-msvcrt-x86_64/x86_64-w64-mingw32/bin", "/d/mingw-w64/llvm-mingw-20231128-msvcrt-x86_64/bin"},
	116	+ ["MinGWLLVM-ucrt17-64"] = {"/d/mingw-w64/llvm-mingw-20231128-ucrt-x86_64/x86_64-w64-mingw32/bin", "/d/mingw-w64/llvm-mingw-20231128-ucrt-x86_64/bin"},
117	117	},
118	118	["sourcePackagePath"] = "/d/Qt/",
119	119	["androidNdkPath"] = {
120	120	["r21e"] = "/d/android-ndk-r21e/",
121	121	["r23c"] = "/d/android-ndk-r23c/",
122	122	["r25c"] = "/d/android-ndk-r25c/",
123		- ["r26"] = "/d/android-ndk-r26/",
	123	+ ["r26b"] = "/d/android-ndk-r26b/",
124	124	},
125	125	["androidNdkHost"] = "windows-x86_64",
126	126	["defaultToolchainExecutableName"] = "gcc",

		@@ -145,7 +145,7 @@ conf.host.linux = {
145	145	["r21e"] = "/opt/env/android-ndk-r21e/",
146	146	["r23c"] = "/opt/env/android-ndk-r23c/",
147	147	["r25c"] = "/opt/env/android-ndk-r25c/",
148		- ["r26"] = "/opt/env/android-ndk-r26/",
	148	+ ["r26b"] = "/opt/env/android-ndk-r26b/",
149	149	},
150	150	["androidNdkHost"] = "linux-x86_64",
151	151	["sourcePackagePath"] = "/opt/sources/",

		@@ -212,7 +212,7 @@ conf.host.macM1 = {
212	212	["r21e"] = "/Applications/AndroidNDK7075529.app/Contents/NDK/",
213	213	["r23c"] = "/Applications/AndroidNDK8568313.app/Contents/NDK/",
214	214	["r25c"] = "/Applications/AndroidNDK9519653.app/Contents/NDK/",
215		- ["r26"] = "/Applications/AndroidNDK10792818.app/Contents/NDK/",
	215	+ ["r26b"] = "/Applications/AndroidNDK10792818.app/Contents/NDK/",
216	216	},
217	217	["androidNdkHost"] = "darwin-x86_64",
218	218	["sourcePackagePath"] = "/opt/sources/",

--- a/Compile/lib/mariadbCompile/conf.lua

+++ b/Compile/lib/mariadbCompile/conf.lua

		@@ -4,8 +4,8 @@ local conf = {}
4	4	--[[
5	5	abbrs:
6	6	mariadb Versions:
7		- m3_1: mariadb connector C 3.1.22
8		- m3_3: mariadb connector C 3.3.7
	7	+ m3_1: mariadb connector C 3.1.23
	8	+ m3_3: mariadb connector C 3.3.8
9	9
10	10	Platforms:
11	11	w: Windows

		@@ -41,11 +41,11 @@ abbrs:
41	41
42	42	--------------------------------------------------------------------
43	43
44		--- mariadb connector 3.1.22
	44	+-- mariadb connector 3.1.23
45	45
46	46	conf.m3_1wx3v5 = {
47		- name = "mariadb_connector_c3.1.22-Windows-x86-VS2015",
48		- mariadbVersion = "3.1.22",
	47	+ name = "mariadb_connector_c3.1.23-Windows-x86-VS2015",
	48	+ mariadbVersion = "3.1.23",
49	49	host = "Win8",
50	50	toolchain = "MSVC2015-32",
51	51	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -67,8 +67,8 @@ conf.m3_1wx3v5 = {
67	67	}
68	68
69	69	conf.m3_1wx6v5 = {
70		- name = "mariadb_connector_c3.1.22-Windows-x86_64-VS2015",
71		- mariadbVersion = "3.1.22",
	70	+ name = "mariadb_connector_c3.1.23-Windows-x86_64-VS2015",
	71	+ mariadbVersion = "3.1.23",
72	72	host = "Win8",
73	73	toolchain = "MSVC2015-64",
74	74	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -90,8 +90,8 @@ conf.m3_1wx6v5 = {
90	90	}
91	91
92	92	conf.m3_1wx3v7 = {
93		- name = "mariadb_connector_c3.1.22-Windows-x86-VS2017-&TARGETTOOLVERSION&",
94		- mariadbVersion = "3.1.22",
	93	+ name = "mariadb_connector_c3.1.23-Windows-x86-VS2017-&TARGETTOOLVERSION&",
	94	+ mariadbVersion = "3.1.23",
95	95	host = "Win10",
96	96	toolchain = "MSVC2017-32",
97	97	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -113,8 +113,8 @@ conf.m3_1wx3v7 = {
113	113	}
114	114
115	115	conf.m3_1wx6v7 = {
116		- name = "mariadb_connector_c3.1.22-Windows-x86_64-VS2017-&TARGETTOOLVERSION&",
117		- mariadbVersion = "3.1.22",
	116	+ name = "mariadb_connector_c3.1.23-Windows-x86_64-VS2017-&TARGETTOOLVERSION&",
	117	+ mariadbVersion = "3.1.23",
118	118	host = "Win10",
119	119	toolchain = "MSVC2017-64",
120	120	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -136,8 +136,8 @@ conf.m3_1wx6v7 = {
136	136	}
137	137
138	138	conf.m3_1wx3v9 = {
139		- name = "mariadb_connector_c3.1.22-Windows-x86-VS2019-&TARGETTOOLVERSION&",
140		- mariadbVersion = "3.1.22",
	139	+ name = "mariadb_connector_c3.1.23-Windows-x86-VS2019-&TARGETTOOLVERSION&",
	140	+ mariadbVersion = "3.1.23",
141	141	host = "Win10",
142	142	toolchain = "MSVC2019-32",
143	143	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -159,8 +159,8 @@ conf.m3_1wx3v9 = {
159	159	}
160	160
161	161	conf.m3_1wx6v9 = {
162		- name = "mariadb_connector_c3.1.22-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
163		- mariadbVersion = "3.1.22",
	162	+ name = "mariadb_connector_c3.1.23-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
	163	+ mariadbVersion = "3.1.23",
164	164	host = "Win10",
165	165	toolchain = "MSVC2019-64",
166	166	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -182,8 +182,8 @@ conf.m3_1wx6v9 = {
182	182	}
183	183
184	184	conf.m3_1wx6v2 = {
185		- name = "mariadb_connector_c3.1.22-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
186		- mariadbVersion = "3.1.22",
	185	+ name = "mariadb_connector_c3.1.23-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
	186	+ mariadbVersion = "3.1.23",
187	187	host = "Win10",
188	188	toolchain = "MSVC2022-64",
189	189	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -208,8 +208,8 @@ conf.m3_1wx6v2 = {
208	208
209	209	-- build failed due to conflicting function definition???
210	210	conf.m3_1wx3g8 = {
211		- name = "mariadb_connector_c3.1.22-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&",
212		- mariadbVersion = "3.1.22",
	211	+ name = "mariadb_connector_c3.1.23-Windows-x86-MinGW-GCC&TARGETTOOLVERSION&",
	212	+ mariadbVersion = "3.1.23",
213	213	host = "Win10",
214	214	toolchain = "MinGW810-32",
215	215	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -231,8 +231,8 @@ conf.m3_1wx3g8 = {
231	231	}
232	232
233	233	conf.m3_1wx6g8 = {
234		- name = "mariadb_connector_c3.1.22-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
235		- mariadbVersion = "3.1.22",
	234	+ name = "mariadb_connector_c3.1.23-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
	235	+ mariadbVersion = "3.1.23",
236	236	host = "Win10",
237	237	toolchain = "MinGW810-64",
238	238	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -256,8 +256,8 @@ conf.m3_1wx6g8 = {
256	256	--------------------------------------------------------------------
257	257
258	258	conf.m3_1mal = {
259		- name = "mariadb_connector_c3.1.22-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
260		- mariadbVersion = "3.1.22",
	259	+ name = "mariadb_connector_c3.1.23-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
	260	+ mariadbVersion = "3.1.23",
261	261	host = "macOSM1",
262	262	libPath = { "lib/mariadb/libmariadb.3.dylib" },
263	263	configureParameter = [[

		@@ -280,11 +280,11 @@ conf.m3_1mal = {
280	280
281	281	--------------------------------------------------------------------
282	282
283		--- mariadb connector 3.3.7
	283	+-- mariadb connector 3.3.8
284	284
285	285	conf.m3_3wx6v9 = {
286		- name = "mariadb_connector_c3.3.7-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
287		- mariadbVersion = "3.3.7",
	286	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
	287	+ mariadbVersion = "3.3.8",
288	288	host = "Win10",
289	289	toolchain = "MSVC2019-64",
290	290	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -307,8 +307,8 @@ conf.m3_3wx6v9 = {
307	307	}
308	308
309	309	conf.m3_3wx6v2 = {
310		- name = "mariadb_connector_c3.3.7-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
311		- mariadbVersion = "3.3.7",
	310	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
	311	+ mariadbVersion = "3.3.8",
312	312	host = "Win10",
313	313	toolchain = "MSVC2022-64",
314	314	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -333,8 +333,8 @@ conf.m3_3wx6v2 = {
333	333	--------------------------------------------------------------------
334	334
335	335	conf.m3_3wx6g1 = {
336		- name = "mariadb_connector_c3.3.7-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
337		- mariadbVersion = "3.3.7",
	336	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
	337	+ mariadbVersion = "3.3.8",
338	338	host = "Win10",
339	339	toolchain = "MinGW1120-64",
340	340	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -357,8 +357,8 @@ conf.m3_3wx6g1 = {
357	357	}
358	358
359	359	conf.m3_3wx6p2 = {
360		- name = "mariadb_connector_c3.3.7-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt",
361		- mariadbVersion = "3.3.7",
	360	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt",
	361	+ mariadbVersion = "3.3.8",
362	362	host = "Win10",
363	363	toolchain = "MinGW122u-64",
364	364	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -381,8 +381,8 @@ conf.m3_3wx6p2 = {
381	381	}
382	382
383	383	conf.m3_3wx6g2 = {
384		- name = "mariadb_connector_c3.3.7-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt",
385		- mariadbVersion = "3.3.7",
	384	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt",
	385	+ mariadbVersion = "3.3.8",
386	386	host = "Win10",
387	387	toolchain = "MinGW1220-64",
388	388	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -405,8 +405,8 @@ conf.m3_3wx6g2 = {
405	405	}
406	406
407	407	conf.m3_3wx6p3 = {
408		- name = "mariadb_connector_c3.3.7-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt",
409		- mariadbVersion = "3.3.7",
	408	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt",
	409	+ mariadbVersion = "3.3.8",
410	410	host = "Win10",
411	411	toolchain = "MinGW132u-64",
412	412	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -429,8 +429,8 @@ conf.m3_3wx6p3 = {
429	429	}
430	430
431	431	conf.m3_3wx6g3 = {
432		- name = "mariadb_connector_c3.3.7-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt",
433		- mariadbVersion = "3.3.7",
	432	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt",
	433	+ mariadbVersion = "3.3.8",
434	434	host = "Win10",
435	435	toolchain = "MinGW1320-64",
436	436	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -455,8 +455,8 @@ conf.m3_3wx6g3 = {
455	455	--------------------------------------------------------------------
456	456
457	457	conf.m3_3wx6u5 = {
458		- name = "mariadb_connector_c3.3.7-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
459		- mariadbVersion = "3.3.7",
	458	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
	459	+ mariadbVersion = "3.3.8",
460	460	host = "Win10",
461	461	toolchain = "MinGWLLVM-ucrt15-64",
462	462	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -481,8 +481,8 @@ conf.m3_3wx6u5 = {
481	481	}
482	482
483	483	conf.m3_3wx6s5 = {
484		- name = "mariadb_connector_c3.3.7-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
485		- mariadbVersion = "3.3.7",
	484	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
	485	+ mariadbVersion = "3.3.8",
486	486	host = "Win10",
487	487	toolchain = "MinGWLLVM-msvcrt15-64",
488	488	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -509,8 +509,8 @@ conf.m3_3wx6s5 = {
509	509	--------------------------------------------------------------------
510	510
511	511	conf.m3_3wx6u6 = {
512		- name = "mariadb_connector_c3.3.7-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
513		- mariadbVersion = "3.3.7",
	512	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
	513	+ mariadbVersion = "3.3.8",
514	514	host = "Win10",
515	515	toolchain = "MinGWLLVM-ucrt16-64",
516	516	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -535,8 +535,8 @@ conf.m3_3wx6u6 = {
535	535	}
536	536
537	537	conf.m3_3wx6s6 = {
538		- name = "mariadb_connector_c3.3.7-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
539		- mariadbVersion = "3.3.7",
	538	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
	539	+ mariadbVersion = "3.3.8",
540	540	host = "Win10",
541	541	toolchain = "MinGWLLVM-msvcrt16-64",
542	542	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -563,8 +563,8 @@ conf.m3_3wx6s6 = {
563	563	--------------------------------------------------------------------
564	564
565	565	conf.m3_3wx6u7 = {
566		- name = "mariadb_connector_c3.3.7-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
567		- mariadbVersion = "3.3.7",
	566	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
	567	+ mariadbVersion = "3.3.8",
568	568	host = "Win10",
569	569	toolchain = "MinGWLLVM-ucrt17-64",
570	570	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -589,8 +589,8 @@ conf.m3_3wx6u7 = {
589	589	}
590	590
591	591	conf.m3_3wx6s7 = {
592		- name = "mariadb_connector_c3.3.7-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
593		- mariadbVersion = "3.3.7",
	592	+ name = "mariadb_connector_c3.3.8-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
	593	+ mariadbVersion = "3.3.8",
594	594	host = "Win10",
595	595	toolchain = "MinGWLLVM-msvcrt17-64",
596	596	libPath = { "lib\\mariadb\\libmariadb.dll" },

		@@ -617,8 +617,8 @@ conf.m3_3wx6s7 = {
617	617	--------------------------------------------------------------------
618	618
619	619	conf.m3_3mal = {
620		- name = "mariadb_connector_c3.3.7-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
621		- mariadbVersion = "3.3.7",
	620	+ name = "mariadb_connector_c3.3.8-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
	621	+ mariadbVersion = "3.3.8",
622	622	host = "macOSM1",
623	623	libPath = { "lib/mariadb/libmariadb.3.dylib" },
624	624	configureParameter = [[

--- a/Compile/lib/opensslCompile/conf.lua

+++ b/Compile/lib/opensslCompile/conf.lua

		@@ -4,7 +4,7 @@ local conf = {}
4	4	--[[
5	5	abbrs:
6	6	OpenSSL Versions:
7		- o3_0: OpenSSL 3.0.11
	7	+ o3_0: OpenSSL 3.0.12
8	8
9	9	Platforms:
10	10	w: Windows

		@@ -38,7 +38,7 @@ abbrs:
38	38	nl: Android NDK r21e/Previous LTS
39	39	n3: Android NDK r23c/Previous LTS
40	40	n5: Android NDK r25c/Previous LTS
41		- n6: Android NDK r26/Latest LTS
	41	+ n6: Android NDK r26b/Latest LTS
42	42	If omitted, it use a toolchain in default PATH, which should be AppleClang in macOS, or GCC in Linux.
43	43
44	44	Variants:

		@@ -47,11 +47,11 @@ abbrs:
47	47
48	48	--------------------------------------------------------------------
49	49
50		--- OpenSSL 3.0.11
	50	+-- OpenSSL 3.0.12
51	51
52	52	conf.o3_0wx6v9 = {
53		- name = "OpenSSL3.0.11-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
54		- opensslVersion = "3.0.11",
	53	+ name = "OpenSSL3.0.12-Windows-x86_64-VS2019-&TARGETTOOLVERSION&",
	54	+ opensslVersion = "3.0.12",
55	55	host = "Win10",
56	56	toolchain = "MSVC2019-64",
57	57	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -67,8 +67,8 @@ conf.o3_0wx6v9 = {
67	67	}
68	68
69	69	conf.o3_0wx6v9st = {
70		- name = "OpenSSL3.0.11-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static",
71		- opensslVersion = "3.0.11",
	70	+ name = "OpenSSL3.0.12-Windows-x86_64-VS2019-&TARGETTOOLVERSION&-static",
	71	+ opensslVersion = "3.0.12",
72	72	host = "Win10",
73	73	toolchain = "MSVC2019-64",
74	74	variant = {"-static"},

		@@ -86,8 +86,8 @@ conf.o3_0wx6v9st = {
86	86	}
87	87
88	88	conf.o3_0wx6v2 = {
89		- name = "OpenSSL3.0.11-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
90		- opensslVersion = "3.0.11",
	89	+ name = "OpenSSL3.0.12-Windows-x86_64-VS2022-&TARGETTOOLVERSION&",
	90	+ opensslVersion = "3.0.12",
91	91	host = "Win10",
92	92	toolchain = "MSVC2022-64",
93	93	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -103,8 +103,8 @@ conf.o3_0wx6v2 = {
103	103	}
104	104
105	105	conf.o3_0wx6v2st = {
106		- name = "OpenSSL3.0.11-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static",
107		- opensslVersion = "3.0.11",
	106	+ name = "OpenSSL3.0.12-Windows-x86_64-VS2022-&TARGETTOOLVERSION&-static",
	107	+ opensslVersion = "3.0.12",
108	108	host = "Win10",
109	109	toolchain = "MSVC2022-64",
110	110	variant = {"-static"},

		@@ -124,8 +124,8 @@ conf.o3_0wx6v2st = {
124	124	--------------------------------------------------------------------
125	125
126	126	conf.o3_0wx6g1 = {
127		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
128		- opensslVersion = "3.0.11",
	127	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&",
	128	+ opensslVersion = "3.0.12",
129	129	host = "Win10SH",
130	130	toolchain = "MinGW1120-64",
131	131	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -141,8 +141,8 @@ conf.o3_0wx6g1 = {
141	141	}
142	142
143	143	conf.o3_0wx6p2 = {
144		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt",
145		- opensslVersion = "3.0.11",
	144	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt",
	145	+ opensslVersion = "3.0.12",
146	146	host = "Win10SH",
147	147	toolchain = "MinGW122u-64",
148	148	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -158,8 +158,8 @@ conf.o3_0wx6p2 = {
158	158	}
159	159
160	160	conf.o3_0wx6g2 = {
161		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt",
162		- opensslVersion = "3.0.11",
	161	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt",
	162	+ opensslVersion = "3.0.12",
163	163	host = "Win10SH",
164	164	toolchain = "MinGW1220-64",
165	165	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -175,8 +175,8 @@ conf.o3_0wx6g2 = {
175	175	}
176	176
177	177	conf.o3_0wx6p3 = {
178		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt",
179		- opensslVersion = "3.0.11",
	178	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt",
	179	+ opensslVersion = "3.0.12",
180	180	host = "Win10SH",
181	181	toolchain = "MinGW132u-64",
182	182	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -192,8 +192,8 @@ conf.o3_0wx6p3 = {
192	192	}
193	193
194	194	conf.o3_0wx6g3 = {
195		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt",
196		- opensslVersion = "3.0.11",
	195	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt",
	196	+ opensslVersion = "3.0.12",
197	197	host = "Win10SH",
198	198	toolchain = "MinGW1320-64",
199	199	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -209,8 +209,8 @@ conf.o3_0wx6g3 = {
209	209	}
210	210
211	211	conf.o3_0wx6u5 = {
212		- name = "OpenSSL3.0.11-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
213		- opensslVersion = "3.0.11",
	212	+ name = "OpenSSL3.0.12-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
	213	+ opensslVersion = "3.0.12",
214	214	host = "Win10SH",
215	215	toolchain = "MinGWLLVM-ucrt15-64",
216	216	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -227,8 +227,8 @@ conf.o3_0wx6u5 = {
227	227	}
228	228
229	229	conf.o3_0wx6s5 = {
230		- name = "OpenSSL3.0.11-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
231		- opensslVersion = "3.0.11",
	230	+ name = "OpenSSL3.0.12-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
	231	+ opensslVersion = "3.0.12",
232	232	host = "Win10SH",
233	233	toolchain = "MinGWLLVM-msvcrt15-64",
234	234	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -245,8 +245,8 @@ conf.o3_0wx6s5 = {
245	245	}
246	246
247	247	conf.o3_0wx6u6 = {
248		- name = "OpenSSL3.0.11-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
249		- opensslVersion = "3.0.11",
	248	+ name = "OpenSSL3.0.12-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
	249	+ opensslVersion = "3.0.12",
250	250	host = "Win10SH",
251	251	toolchain = "MinGWLLVM-ucrt16-64",
252	252	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -263,8 +263,8 @@ conf.o3_0wx6u6 = {
263	263	}
264	264
265	265	conf.o3_0wx6s6 = {
266		- name = "OpenSSL3.0.11-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
267		- opensslVersion = "3.0.11",
	266	+ name = "OpenSSL3.0.12-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
	267	+ opensslVersion = "3.0.12",
268	268	host = "Win10SH",
269	269	toolchain = "MinGWLLVM-msvcrt16-64",
270	270	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -281,8 +281,8 @@ conf.o3_0wx6s6 = {
281	281	}
282	282
283	283	conf.o3_0wx6u7 = {
284		- name = "OpenSSL3.0.11-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
285		- opensslVersion = "3.0.11",
	284	+ name = "OpenSSL3.0.12-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-ucrt",
	285	+ opensslVersion = "3.0.12",
286	286	host = "Win10SH",
287	287	toolchain = "MinGWLLVM-ucrt17-64",
288	288	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -299,8 +299,8 @@ conf.o3_0wx6u7 = {
299	299	}
300	300
301	301	conf.o3_0wx6s7 = {
302		- name = "OpenSSL3.0.11-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
303		- opensslVersion = "3.0.11",
	302	+ name = "OpenSSL3.0.12-Windows-x86_64-llvm-mingw-&TARGETTOOLVERSION&-msvcrt",
	303	+ opensslVersion = "3.0.12",
304	304	host = "Win10SH",
305	305	toolchain = "MinGWLLVM-msvcrt17-64",
306	306	libPath = { "bin\\libssl-3-x64.dll", "bin\\libcrypto-3-x64.dll" },

		@@ -319,8 +319,8 @@ conf.o3_0wx6s7 = {
319	319	--------------------------------------------------------------------
320	320
321	321	conf.o3_0wx6g1st = {
322		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-static",
323		- opensslVersion = "3.0.11",
	322	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-static",
	323	+ opensslVersion = "3.0.12",
324	324	host = "Win10SH",
325	325	toolchain = "MinGW1120-64",
326	326	variant = {"-static"},

		@@ -339,8 +339,8 @@ conf.o3_0wx6g1st = {
339	339	}
340	340
341	341	conf.o3_0wx6p2st = {
342		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt-static",
343		- opensslVersion = "3.0.11",
	342	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt-static",
	343	+ opensslVersion = "3.0.12",
344	344	host = "Win10SH",
345	345	toolchain = "MinGW122u-64",
346	346	variant = {"-static"},

		@@ -359,8 +359,8 @@ conf.o3_0wx6p2st = {
359	359	}
360	360
361	361	conf.o3_0wx6g2st = {
362		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt-static",
363		- opensslVersion = "3.0.11",
	362	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt-static",
	363	+ opensslVersion = "3.0.12",
364	364	host = "Win10SH",
365	365	toolchain = "MinGW1220-64",
366	366	variant = {"-static"},

		@@ -379,8 +379,8 @@ conf.o3_0wx6g2st = {
379	379	}
380	380
381	381	conf.o3_0wx6p3st = {
382		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt-static",
383		- opensslVersion = "3.0.11",
	382	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-ucrt-static",
	383	+ opensslVersion = "3.0.12",
384	384	host = "Win10SH",
385	385	toolchain = "MinGW132u-64",
386	386	variant = {"-static"},

		@@ -399,8 +399,8 @@ conf.o3_0wx6p3st = {
399	399	}
400	400
401	401	conf.o3_0wx6g3st = {
402		- name = "OpenSSL3.0.11-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt-static",
403		- opensslVersion = "3.0.11",
	402	+ name = "OpenSSL3.0.12-Windows-x86_64-MinGW-GCC&TARGETTOOLVERSION&-msvcrt-static",
	403	+ opensslVersion = "3.0.12",
404	404	host = "Win10SH",
405	405	toolchain = "MinGW1320-64",
406	406	variant = {"-static"},

		@@ -422,8 +422,8 @@ conf.o3_0wx6g3st = {
422	422
423	423	-- cross build this configuration for easy unify
424	424	conf.o3_0mx6 = {
425		- name = "OpenSSL3.0.11-macOS-x86_64-AppleClang&TARGETTOOLVERSION&",
426		- opensslVersion = "3.0.11",
	425	+ name = "OpenSSL3.0.12-macOS-x86_64-AppleClang&TARGETTOOLVERSION&",
	426	+ opensslVersion = "3.0.12",
427	427	host = "macOSM1",
428	428	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
429	429	staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },

		@@ -439,8 +439,8 @@ conf.o3_0mx6 = {
439	439	}
440	440
441	441	conf.o3_0ma6 = {
442		- name = "OpenSSL3.0.11-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&",
443		- opensslVersion = "3.0.11",
	442	+ name = "OpenSSL3.0.12-macOS-arm64_v8a-AppleClang&TARGETTOOLVERSION&",
	443	+ opensslVersion = "3.0.12",
444	444	host = "macOSM1",
445	445	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
446	446	staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },

		@@ -456,8 +456,8 @@ conf.o3_0ma6 = {
456	456	}
457	457
458	458	conf.o3_0mal = {
459		- name = "OpenSSL3.0.11-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
460		- opensslVersion = "3.0.11",
	459	+ name = "OpenSSL3.0.12-macOS-ALL-AppleClang&TARGETTOOLVERSION&",
	460	+ opensslVersion = "3.0.12",
461	461	host = "macOSM1",
462	462	libPath = { "lib/libssl.3.dylib", "lib/libcrypto.3.dylib" },
463	463	staticlibPath = { "lib/libssl.a", "lib/libcrypto.a" },

		@@ -471,8 +471,8 @@ conf.o3_0mal = {
471	471	--------------------------------------------------------------------
472	472
473	473	conf.o3_0aa3nl = {
474		- name = "OpenSSL3.0.11-Android-arm-NDKr21eAPI21",
475		- opensslVersion = "3.0.11",
	474	+ name = "OpenSSL3.0.12-Android-arm-NDKr21eAPI21",
	475	+ opensslVersion = "3.0.12",
476	476	host = "CentOS8",
477	477	target = "Android-21",
478	478	toolchainT = "Android-21-r21e-arm",

		@@ -498,8 +498,8 @@ conf.o3_0aa3nl = {
498	498	}
499	499
500	500	conf.o3_0aa6nl = {
501		- name = "OpenSSL3.0.11-Android-arm64-NDKr21eAPI21",
502		- opensslVersion = "3.0.11",
	501	+ name = "OpenSSL3.0.12-Android-arm64-NDKr21eAPI21",
	502	+ opensslVersion = "3.0.12",
503	503	host = "CentOS8",
504	504	target = "Android-21",
505	505	toolchainT = "Android-21-r21e-arm64",

		@@ -520,8 +520,8 @@ conf.o3_0aa6nl = {
520	520	}
521	521
522	522	conf.o3_0ax3nl = {
523		- name = "OpenSSL3.0.11-Android-x86-NDKr21eAPI21",
524		- opensslVersion = "3.0.11",
	523	+ name = "OpenSSL3.0.12-Android-x86-NDKr21eAPI21",
	524	+ opensslVersion = "3.0.12",
525	525	host = "CentOS8",
526	526	target = "Android-21",
527	527	toolchainT = "Android-21-r21e-x86",

		@@ -542,8 +542,8 @@ conf.o3_0ax3nl = {
542	542	}
543	543
544	544	conf.o3_0ax6nl = {
545		- name = "OpenSSL3.0.11-Android-x86_64-NDKr21eAPI21",
546		- opensslVersion = "3.0.11",
	545	+ name = "OpenSSL3.0.12-Android-x86_64-NDKr21eAPI21",
	546	+ opensslVersion = "3.0.12",
547	547	host = "CentOS8",
548	548	target = "Android-21",
549	549	toolchainT = "Android-21-r21e-x86_64",

		@@ -564,8 +564,8 @@ conf.o3_0ax6nl = {
564	564	}
565	565
566	566	conf.o3_0aalnl = {
567		- name = "OpenSSL3.0.11-Android-ALL-NDKr21eAPI21",
568		- opensslVersion = "3.0.11",
	567	+ name = "OpenSSL3.0.12-Android-ALL-NDKr21eAPI21",
	568	+ opensslVersion = "3.0.12",
569	569	host = "CentOS8",
570	570	opensslUnifyType = "Android",
571	571	opensslUnifyArch = {

		@@ -579,8 +579,8 @@ conf.o3_0aalnl = {
579	579	--------------------------------------------------------------------
580	580
581	581	conf.o3_0aa3n321 = {
582		- name = "OpenSSL3.0.11-Android-arm-NDKr23cAPI21",
583		- opensslVersion = "3.0.11",
	582	+ name = "OpenSSL3.0.12-Android-arm-NDKr23cAPI21",
	583	+ opensslVersion = "3.0.12",
584	584	host = "CentOS8",
585	585	target = "Android-21",
586	586	toolchainT = "Android-21-r23c-arm",

		@@ -606,8 +606,8 @@ conf.o3_0aa3n321 = {
606	606	}
607	607
608	608	conf.o3_0aa6n321 = {
609		- name = "OpenSSL3.0.11-Android-arm64-NDKr23cAPI21",
610		- opensslVersion = "3.0.11",
	609	+ name = "OpenSSL3.0.12-Android-arm64-NDKr23cAPI21",
	610	+ opensslVersion = "3.0.12",
611	611	host = "CentOS8",
612	612	target = "Android-21",
613	613	toolchainT = "Android-21-r23c-arm64",

		@@ -628,8 +628,8 @@ conf.o3_0aa6n321 = {
628	628	}
629	629
630	630	conf.o3_0ax3n321 = {
631		- name = "OpenSSL3.0.11-Android-x86-NDKr23cAPI21",
632		- opensslVersion = "3.0.11",
	631	+ name = "OpenSSL3.0.12-Android-x86-NDKr23cAPI21",
	632	+ opensslVersion = "3.0.12",
633	633	host = "CentOS8",
634	634	target = "Android-21",
635	635	toolchainT = "Android-21-r23c-x86",

		@@ -650,8 +650,8 @@ conf.o3_0ax3n321 = {
650	650	}
651	651
652	652	conf.o3_0ax6n321 = {
653		- name = "OpenSSL3.0.11-Android-x86_64-NDKr23cAPI21",
654		- opensslVersion = "3.0.11",
	653	+ name = "OpenSSL3.0.12-Android-x86_64-NDKr23cAPI21",
	654	+ opensslVersion = "3.0.12",
655	655	host = "CentOS8",
656	656	target = "Android-21",
657	657	toolchainT = "Android-21-r23c-x86_64",

		@@ -672,8 +672,8 @@ conf.o3_0ax6n321 = {
672	672	}
673	673
674	674	conf.o3_0aaln321 = {
675		- name = "OpenSSL3.0.11-Android-ALL-NDKr23cAPI21",
676		- opensslVersion = "3.0.11",
	675	+ name = "OpenSSL3.0.12-Android-ALL-NDKr23cAPI21",
	676	+ opensslVersion = "3.0.12",
677	677	host = "CentOS8",
678	678	opensslUnifyType = "Android",
679	679	opensslUnifyArch = {

		@@ -687,8 +687,8 @@ conf.o3_0aaln321 = {
687	687	--------------------------------------------------------------------
688	688
689	689	conf.o3_0aa3n324 = {
690		- name = "OpenSSL3.0.11-Android-arm-NDKr23cAPI24",
691		- opensslVersion = "3.0.11",
	690	+ name = "OpenSSL3.0.12-Android-arm-NDKr23cAPI24",
	691	+ opensslVersion = "3.0.12",
692	692	host = "CentOS8",
693	693	target = "Android-24",
694	694	toolchainT = "Android-24-r23c-arm",

		@@ -714,8 +714,8 @@ conf.o3_0aa3n324 = {
714	714	}
715	715
716	716	conf.o3_0aa6n324 = {
717		- name = "OpenSSL3.0.11-Android-arm64-NDKr23cAPI24",
718		- opensslVersion = "3.0.11",
	717	+ name = "OpenSSL3.0.12-Android-arm64-NDKr23cAPI24",
	718	+ opensslVersion = "3.0.12",
719	719	host = "CentOS8",
720	720	target = "Android-24",
721	721	toolchainT = "Android-24-r23c-arm64",

		@@ -736,8 +736,8 @@ conf.o3_0aa6n324 = {
736	736	}
737	737
738	738	conf.o3_0ax3n324 = {
739		- name = "OpenSSL3.0.11-Android-x86-NDKr23cAPI24",
740		- opensslVersion = "3.0.11",
	739	+ name = "OpenSSL3.0.12-Android-x86-NDKr23cAPI24",
	740	+ opensslVersion = "3.0.12",
741	741	host = "CentOS8",
742	742	target = "Android-24",
743	743	toolchainT = "Android-24-r23c-x86",

		@@ -758,8 +758,8 @@ conf.o3_0ax3n324 = {
758	758	}
759	759
760	760	conf.o3_0ax6n324 = {
761		- name = "OpenSSL3.0.11-Android-x86_64-NDKr23cAPI24",
762		- opensslVersion = "3.0.11",
	761	+ name = "OpenSSL3.0.12-Android-x86_64-NDKr23cAPI24",
	762	+ opensslVersion = "3.0.12",
763	763	host = "CentOS8",
764	764	target = "Android-24",
765	765	toolchainT = "Android-24-r23c-x86_64",

		@@ -780,8 +780,8 @@ conf.o3_0ax6n324 = {
780	780	}
781	781
782	782	conf.o3_0aaln324 = {
783		- name = "OpenSSL3.0.11-Android-ALL-NDKr23cAPI24",
784		- opensslVersion = "3.0.11",
	783	+ name = "OpenSSL3.0.12-Android-ALL-NDKr23cAPI24",
	784	+ opensslVersion = "3.0.12",
785	785	host = "CentOS8",
786	786	opensslUnifyType = "Android",
787	787	opensslUnifyArch = {

		@@ -794,8 +794,8 @@ conf.o3_0aaln324 = {
794	794	--------------------------------------------------------------------
795	795
796	796	conf.o3_0aa3n527 = {
797		- name = "OpenSSL3.0.11-Android-arm-NDKr25API27",
798		- opensslVersion = "3.0.11",
	797	+ name = "OpenSSL3.0.12-Android-arm-NDKr25cAPI27",
	798	+ opensslVersion = "3.0.12",
799	799	host = "Rocky9",
800	800	target = "Android-27",
801	801	toolchainT = "Android-27-r25c-arm",

		@@ -821,8 +821,8 @@ conf.o3_0aa3n527 = {
821	821	}
822	822
823	823	conf.o3_0aa6n527 = {
824		- name = "OpenSSL3.0.11-Android-arm64-NDKr25API27",
825		- opensslVersion = "3.0.11",
	824	+ name = "OpenSSL3.0.12-Android-arm64-NDKr25cAPI27",
	825	+ opensslVersion = "3.0.12",
826	826	host = "Rocky9",
827	827	target = "Android-27",
828	828	toolchainT = "Android-27-r25c-arm64",

		@@ -843,8 +843,8 @@ conf.o3_0aa6n527 = {
843	843	}
844	844
845	845	conf.o3_0ax3n527 = {
846		- name = "OpenSSL3.0.11-Android-x86-NDKr25API27",
847		- opensslVersion = "3.0.11",
	846	+ name = "OpenSSL3.0.12-Android-x86-NDKr25cAPI27",
	847	+ opensslVersion = "3.0.12",
848	848	host = "Rocky9",
849	849	target = "Android-27",
850	850	toolchainT = "Android-27-r25c-x86",

		@@ -865,8 +865,8 @@ conf.o3_0ax3n527 = {
865	865	}
866	866
867	867	conf.o3_0ax6n527 = {
868		- name = "OpenSSL3.0.11-Android-x86_64-NDKr25API27",
869		- opensslVersion = "3.0.11",
	868	+ name = "OpenSSL3.0.12-Android-x86_64-NDKr25cAPI27",
	869	+ opensslVersion = "3.0.12",
870	870	host = "Rocky9",
871	871	target = "Android-27",
872	872	toolchainT = "Android-27-r25c-x86_64",

		@@ -887,8 +887,8 @@ conf.o3_0ax6n527 = {
887	887	}
888	888
889	889	conf.o3_0aaln527 = {
890		- name = "OpenSSL3.0.11-Android-ALL-NDKr25API27",
891		- opensslVersion = "3.0.11",
	890	+ name = "OpenSSL3.0.12-Android-ALL-NDKr25cAPI27",
	891	+ opensslVersion = "3.0.12",
892	892	host = "Rocky9",
893	893	opensslUnifyType = "Android",
894	894	opensslUnifyArch = {

		@@ -902,11 +902,11 @@ conf.o3_0aaln527 = {
902	902	--------------------------------------------------------------------
903	903
904	904	conf.o3_0aa3n627 = {
905		- name = "OpenSSL3.0.11-Android-arm-NDKr26API27",
906		- opensslVersion = "3.0.11",
	905	+ name = "OpenSSL3.0.12-Android-arm-NDKr26bAPI27",
	906	+ opensslVersion = "3.0.12",
907	907	host = "Rocky9",
908	908	target = "Android-27",
909		- toolchainT = "Android-27-r26-arm",
	909	+ toolchainT = "Android-27-r26b-arm",
910	910	configureParameter = [[
911	911	no-asm
912	912	no-shared

		@@ -929,11 +929,11 @@ conf.o3_0aa3n627 = {
929	929	}
930	930
931	931	conf.o3_0aa6n627 = {
932		- name = "OpenSSL3.0.11-Android-arm64-NDKr26API27",
933		- opensslVersion = "3.0.11",
	932	+ name = "OpenSSL3.0.12-Android-arm64-NDKr26bAPI27",
	933	+ opensslVersion = "3.0.12",
934	934	host = "Rocky9",
935	935	target = "Android-27",
936		- toolchainT = "Android-27-r26-arm64",
	936	+ toolchainT = "Android-27-r26b-arm64",
937	937	configureParameter = [[
938	938	no-asm
939	939	no-shared

		@@ -951,11 +951,11 @@ conf.o3_0aa6n627 = {
951	951	}
952	952
953	953	conf.o3_0ax3n627 = {
954		- name = "OpenSSL3.0.11-Android-x86-NDKr26API27",
955		- opensslVersion = "3.0.11",
	954	+ name = "OpenSSL3.0.12-Android-x86-NDKr26bAPI27",
	955	+ opensslVersion = "3.0.12",
956	956	host = "Rocky9",
957	957	target = "Android-27",
958		- toolchainT = "Android-27-r26-x86",
	958	+ toolchainT = "Android-27-r26b-x86",
959	959	configureParameter = [[
960	960	no-asm
961	961	no-shared

		@@ -973,11 +973,11 @@ conf.o3_0ax3n627 = {
973	973	}
974	974
975	975	conf.o3_0ax6n627 = {
976		- name = "OpenSSL3.0.11-Android-x86_64-NDKr26API27",
977		- opensslVersion = "3.0.11",
	976	+ name = "OpenSSL3.0.12-Android-x86_64-NDKr26bAPI27",
	977	+ opensslVersion = "3.0.12",
978	978	host = "Rocky9",
979	979	target = "Android-27",
980		- toolchainT = "Android-27-r26-x86_64",
	980	+ toolchainT = "Android-27-r26b-x86_64",
981	981	configureParameter = [[
982	982	no-asm
983	983	no-shared

		@@ -995,8 +995,8 @@ conf.o3_0ax6n627 = {
995	995	}
996	996
997	997	conf.o3_0aaln627 = {
998		- name = "OpenSSL3.0.11-Android-ALL-NDKr26API27",
999		- opensslVersion = "3.0.11",
	998	+ name = "OpenSSL3.0.12-Android-ALL-NDKr26bAPI27",
	999	+ opensslVersion = "3.0.12",
1000	1000	host = "Rocky9",
1001	1001	opensslUnifyType = "Android",
1002	1002	opensslUnifyArch = {

--- a/Compile/lib/qtCompile/conf.lua

+++ b/Compile/lib/qtCompile/conf.lua

		@@ -46,7 +46,7 @@ abbrs:
46	46	nl: Android NDK r21e/Previous LTS
47	47	n3: Android NDK r23c/Previous LTS
48	48	n5: Android NDK r25c/Previous LTS
49		- n6: Android NDK r26/Latest LTS
	49	+ n6: Android NDK r26b/Latest LTS
50	50	If omitted, it use a toolchain in default PATH, which should be AppleClang in macOS, or GCC in Linux.
51	51
52	52	Variants:

		@@ -5021,12 +5021,12 @@ conf.q6_5mal_ax6n5 = {
5021	5021	}
5022	5022
5023	5023	conf.q6_5wx6g2_aa3n6 = {
5024		- name = "Qt6.5.3-Android-arm-Clang-NDKr26-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
	5024	+ name = "Qt6.5.3-Android-arm-Clang-NDKr26b-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
5025	5025	qtVersion = "6.5.3",
5026	5026	host = "Win10",
5027	5027	target = "Android-27",
5028	5028	toolchain = "MinGW1220-64",
5029		- toolchainT = "Android-27-r26-arm",
	5029	+ toolchainT = "Android-27-r26b-arm",
5030	5030	opensslConf = "o3_0aa3n627",
5031	5031	useCMake = "Latest",
5032	5032	androidSdkVersion = "20230224",

		@@ -5061,12 +5061,12 @@ conf.q6_5wx6g2_aa3n6 = {
5061	5061	}
5062	5062
5063	5063	conf.q6_5wx6g2_aa6n6 = {
5064		- name = "Qt6.5.3-Android-arm64-Clang-NDKr26-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
	5064	+ name = "Qt6.5.3-Android-arm64-Clang-NDKr26b-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
5065	5065	qtVersion = "6.5.3",
5066	5066	host = "Win10",
5067	5067	target = "Android-27",
5068	5068	toolchain = "MinGW1220-64",
5069		- toolchainT = "Android-27-r26-arm64",
	5069	+ toolchainT = "Android-27-r26b-arm64",
5070	5070	opensslConf = "o3_0aa6n627",
5071	5071	useCMake = "Latest",
5072	5072	androidSdkVersion = "20230224",

		@@ -5101,12 +5101,12 @@ conf.q6_5wx6g2_aa6n6 = {
5101	5101	}
5102	5102
5103	5103	conf.q6_5wx6g2_ax6n6 = {
5104		- name = "Qt6.5.3-Android-x86_64-Clang-NDKr26-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
	5104	+ name = "Qt6.5.3-Android-x86_64-Clang-NDKr26b-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
5105	5105	qtVersion = "6.5.3",
5106	5106	host = "Win10",
5107	5107	target = "Android-27",
5108	5108	toolchain = "MinGW1220-64",
5109		- toolchainT = "Android-27-r26-x86_64",
	5109	+ toolchainT = "Android-27-r26b-x86_64",
5110	5110	opensslConf = "o3_0ax6n627",
5111	5111	useCMake = "Latest",
5112	5112	androidSdkVersion = "20230224",

		@@ -5141,11 +5141,11 @@ conf.q6_5wx6g2_ax6n6 = {
5141	5141	}
5142	5142
5143	5143	conf.q6_5lx6_aa3n6 = {
5144		- name = "Qt6.5.3-Android-arm-Clang-NDKr26-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	5144	+ name = "Qt6.5.3-Android-arm-Clang-NDKr26b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5145	5145	qtVersion = "6.5.3",
5146	5146	host = "Rocky9",
5147	5147	target = "Android-27",
5148		- toolchainT = "Android-27-r26-arm",
	5148	+ toolchainT = "Android-27-r26b-arm",
5149	5149	opensslConf = "o3_0aa3n627",
5150	5150	useCMake = "Latest",
5151	5151	androidSdkVersion = "20230224",

		@@ -5179,11 +5179,11 @@ conf.q6_5lx6_aa3n6 = {
5179	5179	}
5180	5180
5181	5181	conf.q6_5lx6_aa6n6 = {
5182		- name = "Qt6.5.3-Android-arm64-Clang-NDKr26-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	5182	+ name = "Qt6.5.3-Android-arm64-Clang-NDKr26b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5183	5183	qtVersion = "6.5.3",
5184	5184	host = "Rocky9",
5185	5185	target = "Android-27",
5186		- toolchainT = "Android-27-r26-arm64",
	5186	+ toolchainT = "Android-27-r26b-arm64",
5187	5187	opensslConf = "o3_0aa6n627",
5188	5188	useCMake = "Latest",
5189	5189	androidSdkVersion = "20230224",

		@@ -5217,11 +5217,11 @@ conf.q6_5lx6_aa6n6 = {
5217	5217	}
5218	5218
5219	5219	conf.q6_5lx6_ax6n6 = {
5220		- name = "Qt6.5.3-Android-x86_64-Clang-NDKr26-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	5220	+ name = "Qt6.5.3-Android-x86_64-Clang-NDKr26b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5221	5221	qtVersion = "6.5.3",
5222	5222	host = "Rocky9",
5223	5223	target = "Android-27",
5224		- toolchainT = "Android-27-r26-x86_64",
	5224	+ toolchainT = "Android-27-r26b-x86_64",
5225	5225	opensslConf = "o3_0ax6n627",
5226	5226	useCMake = "Latest",
5227	5227	androidSdkVersion = "20230224",

		@@ -5255,11 +5255,11 @@ conf.q6_5lx6_ax6n6 = {
5255	5255	}
5256	5256
5257	5257	conf.q6_5mal_aa3n6 = {
5258		- name = "Qt6.5.3-Android-arm-Clang-NDKr26-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	5258	+ name = "Qt6.5.3-Android-arm-Clang-NDKr26b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
5259	5259	qtVersion = "6.5.3",
5260	5260	host = "macOSM1",
5261	5261	target = "Android-27",
5262		- toolchainT = "Android-27-r26-arm",
	5262	+ toolchainT = "Android-27-r26b-arm",
5263	5263	opensslConf = "o3_0aa3n627",
5264	5264	useCMake = "Latest",
5265	5265	androidSdkVersion = "20230224",

		@@ -5293,11 +5293,11 @@ conf.q6_5mal_aa3n6 = {
5293	5293	}
5294	5294
5295	5295	conf.q6_5mal_aa6n6 = {
5296		- name = "Qt6.5.3-Android-arm64-Clang-NDKr26-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	5296	+ name = "Qt6.5.3-Android-arm64-Clang-NDKr26b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
5297	5297	qtVersion = "6.5.3",
5298	5298	host = "macOSM1",
5299	5299	target = "Android-27",
5300		- toolchainT = "Android-27-r26-arm64",
	5300	+ toolchainT = "Android-27-r26b-arm64",
5301	5301	opensslConf = "o3_0aa6n627",
5302	5302	useCMake = "Latest",
5303	5303	androidSdkVersion = "20230224",

		@@ -5331,11 +5331,11 @@ conf.q6_5mal_aa6n6 = {
5331	5331	}
5332	5332
5333	5333	conf.q6_5mal_ax6n6 = {
5334		- name = "Qt6.5.3-Android-x86_64-Clang-NDKr26-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	5334	+ name = "Qt6.5.3-Android-x86_64-Clang-NDKr26b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
5335	5335	qtVersion = "6.5.3",
5336	5336	host = "macOSM1",
5337	5337	target = "Android-27",
5338		- toolchainT = "Android-27-r26-x86_64",
	5338	+ toolchainT = "Android-27-r26b-x86_64",
5339	5339	opensslConf = "o3_0ax6n627",
5340	5340	useCMake = "Latest",
5341	5341	androidSdkVersion = "20230224",

		@@ -5463,8 +5463,8 @@ conf.q6_5mal_W = {
5463	5463	--------------------------------------------------------------------
5464	5464
5465	5465	conf.q6_6wx6v2 = {
5466		- name = "Qt6.6.0-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
5467		- qtVersion = "6.6.0",
	5466	+ name = "Qt6.6.1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&",
	5467	+ qtVersion = "6.6.1",
5468	5468	host = "Win10",
5469	5469	toolchain = "MSVC2022-64",
5470	5470	opensslConf = "o3_0wx6v2",

		@@ -5503,8 +5503,8 @@ conf.q6_6wx6v2 = {
5503	5503	}
5504	5504
5505	5505	conf.q6_6wx6v2st = {
5506		- name = "Qt6.6.0-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
5507		- qtVersion = "6.6.0",
	5506	+ name = "Qt6.6.1-Windows-x86_64-VS2022-&HOSTTOOLVERSION&-static",
	5507	+ qtVersion = "6.6.1",
5508	5508	host = "Win10",
5509	5509	toolchain = "MSVC2022-64",
5510	5510	variant = {"-static"},

		@@ -5568,8 +5568,8 @@ conf.q6_6wx6v2st = {
5568	5568	}
5569	5569
5570	5570	conf.q6_6wx6v2_wa6v2 = {
5571		- name = "Qt6.6.0-Windows-arm64-VS2022-&HOSTTOOLVERSION&-xWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
5572		- qtVersion = "6.6.0",
	5571	+ name = "Qt6.6.1-Windows-arm64-VS2022-&HOSTTOOLVERSION&-xWindows-x86_64-VS2022-&HOSTTOOLVERSION&",
	5572	+ qtVersion = "6.6.1",
5573	5573	host = "Win10",
5574	5574	target = "Win10Arm",
5575	5575	toolchain = "MSVC2022-64", -- only a placeholder here, in fact it uses "toolchainT" instead of "toolchain"

		@@ -5604,8 +5604,8 @@ conf.q6_6wx6v2_wa6v2 = {
5604	5604	}
5605	5605
5606	5606	conf.q6_6wx6p2 = {
5607		- name = "Qt6.6.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt",
5608		- qtVersion = "6.6.0",
	5607	+ name = "Qt6.6.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt",
	5608	+ qtVersion = "6.6.1",
5609	5609	host = "Win10",
5610	5610	toolchain = "MinGW122u-64",
5611	5611	opensslConf = "o3_0wx6p2",

		@@ -5642,8 +5642,8 @@ conf.q6_6wx6p2 = {
5642	5642	}
5643	5643
5644	5644	conf.q6_6wx6g2 = {
5645		- name = "Qt6.6.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
5646		- qtVersion = "6.6.0",
	5645	+ name = "Qt6.6.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
	5646	+ qtVersion = "6.6.1",
5647	5647	host = "Win10",
5648	5648	toolchain = "MinGW1220-64",
5649	5649	opensslConf = "o3_0wx6g2",

		@@ -5680,8 +5680,8 @@ conf.q6_6wx6g2 = {
5680	5680	}
5681	5681
5682	5682	conf.q6_6wx6g2st = {
5683		- name = "Qt6.6.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-static",
5684		- qtVersion = "6.6.0",
	5683	+ name = "Qt6.6.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt-static",
	5684	+ qtVersion = "6.6.1",
5685	5685	host = "Win10",
5686	5686	toolchain = "MinGW1220-64",
5687	5687	variant = {"-static"},

		@@ -5746,8 +5746,8 @@ conf.q6_6wx6g2st = {
5746	5746	}
5747	5747
5748	5748	conf.q6_6wx6p3 = {
5749		- name = "Qt6.6.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt",
5750		- qtVersion = "6.6.0",
	5749	+ name = "Qt6.6.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-ucrt",
	5750	+ qtVersion = "6.6.1",
5751	5751	host = "Win10",
5752	5752	toolchain = "MinGW132u-64",
5753	5753	opensslConf = "o3_0wx6p3",

		@@ -5784,8 +5784,8 @@ conf.q6_6wx6p3 = {
5784	5784	}
5785	5785
5786	5786	conf.q6_6wx6g3 = {
5787		- name = "Qt6.6.0-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
5788		- qtVersion = "6.6.0",
	5787	+ name = "Qt6.6.1-Windows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
	5788	+ qtVersion = "6.6.1",
5789	5789	host = "Win10",
5790	5790	toolchain = "MinGW1320-64",
5791	5791	opensslConf = "o3_0wx6g3",

		@@ -5822,8 +5822,8 @@ conf.q6_6wx6g3 = {
5822	5822	}
5823	5823
5824	5824	conf.q6_6wx6u7 = {
5825		- name = "Qt6.6.0-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
5826		- qtVersion = "6.6.0",
	5825	+ name = "Qt6.6.1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-ucrt",
	5826	+ qtVersion = "6.6.1",
5827	5827	host = "Win10",
5828	5828	toolchain = "MinGWLLVM-ucrt17-64",
5829	5829	opensslConf = "o3_0wx6u7",

		@@ -5864,8 +5864,8 @@ conf.q6_6wx6u7 = {
5864	5864	}
5865	5865
5866	5866	conf.q6_6wx6s7 = {
5867		- name = "Qt6.6.0-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
5868		- qtVersion = "6.6.0",
	5867	+ name = "Qt6.6.1-Windows-x86_64-llvm-mingw-&HOSTTOOLVERSION&-msvcrt",
	5868	+ qtVersion = "6.6.1",
5869	5869	host = "Win10",
5870	5870	toolchain = "MinGWLLVM-msvcrt17-64",
5871	5871	opensslConf = "o3_0wx6s7",

		@@ -5906,8 +5906,8 @@ conf.q6_6wx6s7 = {
5906	5906	}
5907	5907
5908	5908	conf.q6_6lx6st = {
5909		- name = "Qt6.6.0-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
5910		- qtVersion = "6.6.0",
	5909	+ name = "Qt6.6.1-Linux-x86_64-gcc&HOSTTOOLVERSION&-static",
	5910	+ qtVersion = "6.6.1",
5911	5911	host = "Rocky9",
5912	5912	variant = {"-static"},
5913	5913	useCMake = "Latest",

		@@ -5965,8 +5965,8 @@ conf.q6_6lx6st = {
5965	5965	}
5966	5966
5967	5967	conf.q6_6mal = {
5968		- name = "Qt6.6.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&",
5969		- qtVersion = "6.6.0",
	5968	+ name = "Qt6.6.1-macOS-Universal-AppleClang&HOSTTOOLVERSION&",
	5969	+ qtVersion = "6.6.1",
5970	5970	host = "macOSM1",
5971	5971	opensslConf = "o3_0mal",
5972	5972	mysqlConf = "m3_3mal",

		@@ -6012,8 +6012,8 @@ conf.q6_6mal = {
6012	6012	}
6013	6013
6014	6014	conf.q6_6malnf = {
6015		- name = "Qt6.6.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework",
6016		- qtVersion = "6.6.0",
	6015	+ name = "Qt6.6.1-macOS-Universal-AppleClang&HOSTTOOLVERSION&-noFramework",
	6016	+ qtVersion = "6.6.1",
6017	6017	host = "macOSM1",
6018	6018	variant = {"-noFramework"},
6019	6019	opensslConf = "o3_0mal",

		@@ -6060,8 +6060,8 @@ conf.q6_6malnf = {
6060	6060	}
6061	6061
6062	6062	conf.q6_6malst = {
6063		- name = "Qt6.6.0-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static",
6064		- qtVersion = "6.6.0",
	6063	+ name = "Qt6.6.1-macOS-Universal-AppleClang&HOSTTOOLVERSION&-static",
	6064	+ qtVersion = "6.6.1",
6065	6065	host = "macOSM1",
6066	6066	variant = {"-static"},
6067	6067	opensslConf = "o3_0mal",

		@@ -6124,12 +6124,12 @@ conf.q6_6malst = {
6124	6124	}
6125	6125
6126	6126	conf.q6_6wx6g2_aa3n6 = {
6127		- name = "Qt6.6.0-Android-arm-Clang-NDKr26-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
6128		- qtVersion = "6.6.0",
	6127	+ name = "Qt6.6.1-Android-arm-Clang-NDKr26b-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
	6128	+ qtVersion = "6.6.1",
6129	6129	host = "Win10",
6130	6130	target = "Android-27",
6131	6131	toolchain = "MinGW1220-64",
6132		- toolchainT = "Android-27-r26-arm",
	6132	+ toolchainT = "Android-27-r26b-arm",
6133	6133	opensslConf = "o3_0aa3n627",
6134	6134	useCMake = "Latest",
6135	6135	androidSdkVersion = "20230224",

		@@ -6164,12 +6164,12 @@ conf.q6_6wx6g2_aa3n6 = {
6164	6164	}
6165	6165
6166	6166	conf.q6_6wx6g2_aa6n6 = {
6167		- name = "Qt6.6.0-Android-arm64-Clang-NDKr26-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
6168		- qtVersion = "6.6.0",
	6167	+ name = "Qt6.6.1-Android-arm64-Clang-NDKr26b-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
	6168	+ qtVersion = "6.6.1",
6169	6169	host = "Win10",
6170	6170	target = "Android-27",
6171	6171	toolchain = "MinGW1220-64",
6172		- toolchainT = "Android-27-r26-arm64",
	6172	+ toolchainT = "Android-27-r26b-arm64",
6173	6173	opensslConf = "o3_0aa6n627",
6174	6174	useCMake = "Latest",
6175	6175	androidSdkVersion = "20230224",

		@@ -6204,12 +6204,12 @@ conf.q6_6wx6g2_aa6n6 = {
6204	6204	}
6205	6205
6206	6206	conf.q6_6wx6g2_ax6n6 = {
6207		- name = "Qt6.6.0-Android-x86_64-Clang-NDKr26-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
6208		- qtVersion = "6.6.0",
	6207	+ name = "Qt6.6.1-Android-x86_64-Clang-NDKr26b-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
	6208	+ qtVersion = "6.6.1",
6209	6209	host = "Win10",
6210	6210	target = "Android-27",
6211	6211	toolchain = "MinGW1220-64",
6212		- toolchainT = "Android-27-r26-x86_64",
	6212	+ toolchainT = "Android-27-r26b-x86_64",
6213	6213	opensslConf = "o3_0ax6n627",
6214	6214	useCMake = "Latest",
6215	6215	androidSdkVersion = "20230224",

		@@ -6244,11 +6244,11 @@ conf.q6_6wx6g2_ax6n6 = {
6244	6244	}
6245	6245
6246	6246	conf.q6_6lx6_aa3n6 = {
6247		- name = "Qt6.6.0-Android-arm-Clang-NDKr26-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
6248		- qtVersion = "6.6.0",
	6247	+ name = "Qt6.6.1-Android-arm-Clang-NDKr26b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	6248	+ qtVersion = "6.6.1",
6249	6249	host = "Rocky9",
6250	6250	target = "Android-27",
6251		- toolchainT = "Android-27-r26-arm",
	6251	+ toolchainT = "Android-27-r26b-arm",
6252	6252	opensslConf = "o3_0aa3n627",
6253	6253	useCMake = "Latest",
6254	6254	androidSdkVersion = "20230224",

		@@ -6282,11 +6282,11 @@ conf.q6_6lx6_aa3n6 = {
6282	6282	}
6283	6283
6284	6284	conf.q6_6lx6_aa6n6 = {
6285		- name = "Qt6.6.0-Android-arm64-Clang-NDKr26-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
6286		- qtVersion = "6.6.0",
	6285	+ name = "Qt6.6.1-Android-arm64-Clang-NDKr26b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	6286	+ qtVersion = "6.6.1",
6287	6287	host = "Rocky9",
6288	6288	target = "Android-27",
6289		- toolchainT = "Android-27-r26-arm64",
	6289	+ toolchainT = "Android-27-r26b-arm64",
6290	6290	opensslConf = "o3_0aa6n627",
6291	6291	useCMake = "Latest",
6292	6292	androidSdkVersion = "20230224",

		@@ -6320,11 +6320,11 @@ conf.q6_6lx6_aa6n6 = {
6320	6320	}
6321	6321
6322	6322	conf.q6_6lx6_ax6n6 = {
6323		- name = "Qt6.6.0-Android-x86_64-Clang-NDKr26-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
6324		- qtVersion = "6.6.0",
	6323	+ name = "Qt6.6.1-Android-x86_64-Clang-NDKr26b-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	6324	+ qtVersion = "6.6.1",
6325	6325	host = "Rocky9",
6326	6326	target = "Android-27",
6327		- toolchainT = "Android-27-r26-x86_64",
	6327	+ toolchainT = "Android-27-r26b-x86_64",
6328	6328	opensslConf = "o3_0ax6n627",
6329	6329	useCMake = "Latest",
6330	6330	androidSdkVersion = "20230224",

		@@ -6358,11 +6358,11 @@ conf.q6_6lx6_ax6n6 = {
6358	6358	}
6359	6359
6360	6360	conf.q6_6mal_aa3n6 = {
6361		- name = "Qt6.6.0-Android-arm-Clang-NDKr26-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
6362		- qtVersion = "6.6.0",
	6361	+ name = "Qt6.6.1-Android-arm-Clang-NDKr26b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	6362	+ qtVersion = "6.6.1",
6363	6363	host = "macOSM1",
6364	6364	target = "Android-27",
6365		- toolchainT = "Android-27-r26-arm",
	6365	+ toolchainT = "Android-27-r26b-arm",
6366	6366	opensslConf = "o3_0aa3n627",
6367	6367	useCMake = "Latest",
6368	6368	androidSdkVersion = "20230224",

		@@ -6396,11 +6396,11 @@ conf.q6_6mal_aa3n6 = {
6396	6396	}
6397	6397
6398	6398	conf.q6_6mal_aa6n6 = {
6399		- name = "Qt6.6.0-Android-arm64-Clang-NDKr26-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
6400		- qtVersion = "6.6.0",
	6399	+ name = "Qt6.6.1-Android-arm64-Clang-NDKr26b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	6400	+ qtVersion = "6.6.1",
6401	6401	host = "macOSM1",
6402	6402	target = "Android-27",
6403		- toolchainT = "Android-27-r26-arm64",
	6403	+ toolchainT = "Android-27-r26b-arm64",
6404	6404	opensslConf = "o3_0aa6n627",
6405	6405	useCMake = "Latest",
6406	6406	androidSdkVersion = "20230224",

		@@ -6434,11 +6434,11 @@ conf.q6_6mal_aa6n6 = {
6434	6434	}
6435	6435
6436	6436	conf.q6_6mal_ax6n6 = {
6437		- name = "Qt6.6.0-Android-x86_64-Clang-NDKr26-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
6438		- qtVersion = "6.6.0",
	6437	+ name = "Qt6.6.1-Android-x86_64-Clang-NDKr26b-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	6438	+ qtVersion = "6.6.1",
6439	6439	host = "macOSM1",
6440	6440	target = "Android-27",
6441		- toolchainT = "Android-27-r26-x86_64",
	6441	+ toolchainT = "Android-27-r26b-x86_64",
6442	6442	opensslConf = "o3_0ax6n627",
6443	6443	useCMake = "Latest",
6444	6444	androidSdkVersion = "20230224",

		@@ -6473,8 +6473,8 @@ conf.q6_6mal_ax6n6 = {
6473	6473
6474	6474	-- WebAssembly uses emcmake which don't need a toolchain file
6475	6475	conf.q6_6wx6g2_W = {
6476		- name = "Qt6.6.0-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
6477		- qtVersion = "6.6.0",
	6476	+ name = "Qt6.6.1-WebAssembly-emscripten&TARGETTOOLVERSION&-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
	6477	+ qtVersion = "6.6.1",
6478	6478	host = "Win10",
6479	6479	toolchain = "MinGW1220-64",
6480	6480	target = "WebAssembly",

		@@ -6504,8 +6504,8 @@ conf.q6_6wx6g2_W = {
6504	6504	}
6505	6505
6506	6506	conf.q6_6lx6_W = {
6507		- name = "Qt6.6.0-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
6508		- qtVersion = "6.6.0",
	6507	+ name = "Qt6.6.1-WebAssembly-emscripten&TARGETTOOLVERSION&-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
	6508	+ qtVersion = "6.6.1",
6509	6509	host = "Rocky9",
6510	6510	target = "WebAssembly",
6511	6511	toolchainT = "emscripten-3.1.37",

		@@ -6534,8 +6534,8 @@ conf.q6_6lx6_W = {
6534	6534	}
6535	6535
6536	6536	conf.q6_6mal_W = {
6537		- name = "Qt6.6.0-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
6538		- qtVersion = "6.6.0",
	6537	+ name = "Qt6.6.1-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
	6538	+ qtVersion = "6.6.1",
6539	6539	host = "macOSM1",
6540	6540	target = "WebAssembly",
6541	6541	toolchainT = "emscripten-3.1.37",

		@@ -6573,26 +6573,26 @@ local Qt6StaticConf = {
6573	6573	Win10 = {
6574	6574	["6.2.6"] = "q6_2wx6g1st",
6575	6575	["6.5.3"] = "q6_5wx6g2st",
6576		- ["6.6.0"] = "q6_6wx6g2st",
	6576	+ ["6.6.1"] = "q6_6wx6g2st",
6577	6577	},
6578	6578	Win10MSVC2019 = {
6579	6579	["6.2.6"] = "q6_2wx6v9st",
6580	6580	},
6581	6581	Win10MSVC2022 = {
6582	6582	["6.5.3"] = "q6_5wx6v2st",
6583		- ["6.6.0"] = "q6_6wx6v2st",
	6583	+ ["6.6.1"] = "q6_6wx6v2st",
6584	6584	},
6585	6585	CentOS8 = {
6586	6586	["6.2.6"] = "q6_2lx6st",
6587	6587	},
6588	6588	Rocky9 = {
6589	6589	["6.5.3"] = "q6_5lx6st",
6590		- ["6.6.0"] = "q6_6lx6st",
	6590	+ ["6.6.1"] = "q6_6lx6st",
6591	6591	},
6592	6592	macOSM1 = {
6593	6593	["6.2.6"] = "q6_2malst",
6594	6594	["6.5.3"] = "q6_5malst",
6595		- ["6.6.0"] = "q6_6malst",
	6595	+ ["6.6.1"] = "q6_6malst",
6596	6596	},
6597	6597	}
6598	6598

		@@ -6639,7 +6639,7 @@ local Win10SrcPackagePrefixWorkaroundVersions = {
6639	6639	"5.15.11-4",
6640	6640	"6.2.6",
6641	6641	"6.5.3",
6642		- "6.6.0",
	6642	+ "6.6.1",
6643	6643	}
6644	6644
6645	6645	for name, value in pairs(conf) do

Fs-scripts Fork