OSDN -- Open-Source-Software-Entwicklung und Downloads
Übersetzungsstatus von Deutsch translation status for de
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

Commit MetaInfo

Revision9214e5ba59d24c1b5f5ef0e2028a985c0463aee7 (tree)
Zeit2024-04-13 10:40:17
AutorFs <Fsu0413@vip....>
CommiterFs

Log Message

update android ndk

Signed-off-by: Fs <Fsu0413@vip.qq.com>

Ändern Zusammenfassung

Diff

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -55,7 +55,7 @@ conf.host.win = {
5555 ["r21e"] = "D:\\android-ndk-r21e",
5656 ["r23c"] = "D:\\android-ndk-r23c",
5757 ["r25c"] = "D:\\android-ndk-r25c",
58- ["r26c"] = "D:\\android-ndk-r26c",
58+ ["r26d"] = "D:\\android-ndk-r26d",
5959 },
6060 ["androidNdkHost"] = "windows-x86_64",
6161 ["emscriptenPath"] = {
@@ -143,7 +143,7 @@ conf.host.msys = {
143143 ["r21e"] = "/d/android-ndk-r21e/",
144144 ["r23c"] = "/d/android-ndk-r23c/",
145145 ["r25c"] = "/d/android-ndk-r25c/",
146- ["r26c"] = "/d/android-ndk-r26c/",
146+ ["r26d"] = "/d/android-ndk-r26d/",
147147 },
148148 ["androidNdkHost"] = "windows-x86_64",
149149 ["defaultToolchainExecutableName"] = "gcc",
@@ -167,7 +167,7 @@ conf.host.linux = {
167167 ["r21e"] = "/opt/env/android-ndk-r21e/",
168168 ["r23c"] = "/opt/env/android-ndk-r23c/",
169169 ["r25c"] = "/opt/env/android-ndk-r25c/",
170- ["r26c"] = "/opt/env/android-ndk-r26c/",
170+ ["r26d"] = "/opt/env/android-ndk-r26d/",
171171 },
172172 ["androidNdkHost"] = "linux-x86_64",
173173 ["sourcePackagePath"] = "/opt/sources/",
@@ -206,7 +206,7 @@ conf.host.mac = {
206206 ["r21e"] = "/Applications/AndroidNDK7075529.app/Contents/NDK/",
207207 ["r23c"] = "/Applications/AndroidNDK8568313.app/Contents/NDK/",
208208 ["r25c"] = "/Applications/AndroidNDK9519653.app/Contents/NDK/",
209- ["r26c"] = "/Applications/AndroidNDK11394342.app/Contents/NDK/",
209+ ["r26d"] = "/Applications/AndroidNDK11579264.app/Contents/NDK/",
210210 },
211211 ["androidNdkHost"] = "darwin-x86_64",
212212 ["sourcePackagePath"] = "/opt/sources/",
@@ -243,7 +243,7 @@ conf.host.macM1 = {
243243 ["r21e"] = "/Applications/AndroidNDK7075529.app/Contents/NDK/",
244244 ["r23c"] = "/Applications/AndroidNDK8568313.app/Contents/NDK/",
245245 ["r25c"] = "/Applications/AndroidNDK9519653.app/Contents/NDK/",
246- ["r26c"] = "/Applications/AndroidNDK11394342.app/Contents/NDK/",
246+ ["r26d"] = "/Applications/AndroidNDK11579264.app/Contents/NDK/",
247247 },
248248 ["androidNdkHost"] = "darwin-x86_64",
249249 ["sourcePackagePath"] = "/opt/sources/",
--- a/Compile/lib/opensslCompile/conf.lua
+++ b/Compile/lib/opensslCompile/conf.lua
@@ -36,7 +36,7 @@ abbrs:
3636 nV21: Android NDK r21e/Previous LTS
3737 nV23: Android NDK r23c/Previous LTS
3838 nV25: Android NDK r25c/Previous LTS
39- nV26: Android NDK r26c/Latest LTS
39+ nV26: Android NDK r26d/Latest LTS
4040 If omitted, it use a toolchain in default PATH, which should be AppleClang in macOS, or GCC in Linux.
4141
4242 Variants:
@@ -1158,11 +1158,11 @@ conf.o3_0aalnV25L27 = {
11581158 --------------------------------------------------------------------
11591159
11601160 conf.o3_0aa3nV26L27 = {
1161- name = "OpenSSL3.0.13-Android-arm-NDKr26cAPI27",
1161+ name = "OpenSSL3.0.13-Android-arm-NDKr26dAPI27",
11621162 opensslVersion = "3.0.13",
11631163 host = "Rocky9",
11641164 target = "Android-27",
1165- toolchainT = "Android-27-r26c-arm",
1165+ toolchainT = "Android-27-r26d-arm",
11661166 variant = {"-static"},
11671167 configureParameter = [[
11681168 no-asm
@@ -1186,11 +1186,11 @@ conf.o3_0aa3nV26L27 = {
11861186 }
11871187
11881188 conf.o3_0aa6nV26L27 = {
1189- name = "OpenSSL3.0.13-Android-arm64-NDKr26cAPI27",
1189+ name = "OpenSSL3.0.13-Android-arm64-NDKr26dAPI27",
11901190 opensslVersion = "3.0.13",
11911191 host = "Rocky9",
11921192 target = "Android-27",
1193- toolchainT = "Android-27-r26c-arm64",
1193+ toolchainT = "Android-27-r26d-arm64",
11941194 variant = {"-static"},
11951195 configureParameter = [[
11961196 no-asm
@@ -1209,11 +1209,11 @@ conf.o3_0aa6nV26L27 = {
12091209 }
12101210
12111211 conf.o3_0ax3nV26L27 = {
1212- name = "OpenSSL3.0.13-Android-x86-NDKr26cAPI27",
1212+ name = "OpenSSL3.0.13-Android-x86-NDKr26dAPI27",
12131213 opensslVersion = "3.0.13",
12141214 host = "Rocky9",
12151215 target = "Android-27",
1216- toolchainT = "Android-27-r26c-x86",
1216+ toolchainT = "Android-27-r26d-x86",
12171217 variant = {"-static"},
12181218 configureParameter = [[
12191219 no-asm
@@ -1232,11 +1232,11 @@ conf.o3_0ax3nV26L27 = {
12321232 }
12331233
12341234 conf.o3_0ax6nV26L27 = {
1235- name = "OpenSSL3.0.13-Android-x86_64-NDKr26cAPI27",
1235+ name = "OpenSSL3.0.13-Android-x86_64-NDKr26dAPI27",
12361236 opensslVersion = "3.0.13",
12371237 host = "Rocky9",
12381238 target = "Android-27",
1239- toolchainT = "Android-27-r26c-x86_64",
1239+ toolchainT = "Android-27-r26d-x86_64",
12401240 variant = {"-static"},
12411241 configureParameter = [[
12421242 no-asm
@@ -1255,7 +1255,7 @@ conf.o3_0ax6nV26L27 = {
12551255 }
12561256
12571257 conf.o3_0aalnV26L27 = {
1258- name = "OpenSSL3.0.13-Android-ALL-NDKr26cAPI27",
1258+ name = "OpenSSL3.0.13-Android-ALL-NDKr26dAPI27",
12591259 opensslVersion = "3.0.13",
12601260 host = "Rocky9",
12611261 opensslUnifyType = "Android",
--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -44,7 +44,7 @@ abbrs:
4444 nV21: Android NDK r21e/Previous LTS
4545 nV23: Android NDK r23c/Previous LTS
4646 nV25: Android NDK r25c/Previous LTS
47- nV26: Android NDK r26c/Latest LTS
47+ nV26: Android NDK r26d/Latest LTS
4848 If omitted, it use a toolchain in default PATH, which should be AppleClang in macOS, or GCC in Linux.
4949
5050 Variants:
@@ -5304,12 +5304,12 @@ conf.q6_5mal_ax6nV25 = {
53045304 }
53055305
53065306 conf.q6_5wx6g2_aa3nV26 = {
5307- name = "Qt6.5.3-Android-arm-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
5307+ name = "Qt6.5.3-Android-arm-Clang-NDKr26d-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
53085308 qtVersion = "6.5.3",
53095309 host = "Win10",
53105310 target = "Android-27",
53115311 toolchain = "MinGW1220-64",
5312- toolchainT = "Android-27-r26c-arm",
5312+ toolchainT = "Android-27-r26d-arm",
53135313 opensslConf = "o3_0aa3nV26L27",
53145314 useCMake = "Latest",
53155315 androidSdkVersion = "20240205",
@@ -5344,12 +5344,12 @@ conf.q6_5wx6g2_aa3nV26 = {
53445344 }
53455345
53465346 conf.q6_5wx6g2_aa6nV26 = {
5347- name = "Qt6.5.3-Android-arm64-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
5347+ name = "Qt6.5.3-Android-arm64-Clang-NDKr26d-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
53485348 qtVersion = "6.5.3",
53495349 host = "Win10",
53505350 target = "Android-27",
53515351 toolchain = "MinGW1220-64",
5352- toolchainT = "Android-27-r26c-arm64",
5352+ toolchainT = "Android-27-r26d-arm64",
53535353 opensslConf = "o3_0aa6nV26L27",
53545354 useCMake = "Latest",
53555355 androidSdkVersion = "20240205",
@@ -5384,12 +5384,12 @@ conf.q6_5wx6g2_aa6nV26 = {
53845384 }
53855385
53865386 conf.q6_5wx6g2_ax6nV26 = {
5387- name = "Qt6.5.3-Android-x86_64-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
5387+ name = "Qt6.5.3-Android-x86_64-Clang-NDKr26d-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
53885388 qtVersion = "6.5.3",
53895389 host = "Win10",
53905390 target = "Android-27",
53915391 toolchain = "MinGW1220-64",
5392- toolchainT = "Android-27-r26c-x86_64",
5392+ toolchainT = "Android-27-r26d-x86_64",
53935393 opensslConf = "o3_0ax6nV26L27",
53945394 useCMake = "Latest",
53955395 androidSdkVersion = "20240205",
@@ -5424,11 +5424,11 @@ conf.q6_5wx6g2_ax6nV26 = {
54245424 }
54255425
54265426 conf.q6_5lx6_aa3nV26 = {
5427- name = "Qt6.5.3-Android-arm-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5427+ name = "Qt6.5.3-Android-arm-Clang-NDKr26d-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
54285428 qtVersion = "6.5.3",
54295429 host = "Rocky9",
54305430 target = "Android-27",
5431- toolchainT = "Android-27-r26c-arm",
5431+ toolchainT = "Android-27-r26d-arm",
54325432 opensslConf = "o3_0aa3nV26L27",
54335433 useCMake = "Latest",
54345434 androidSdkVersion = "20240205",
@@ -5462,11 +5462,11 @@ conf.q6_5lx6_aa3nV26 = {
54625462 }
54635463
54645464 conf.q6_5lx6_aa6nV26 = {
5465- name = "Qt6.5.3-Android-arm64-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5465+ name = "Qt6.5.3-Android-arm64-Clang-NDKr26d-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
54665466 qtVersion = "6.5.3",
54675467 host = "Rocky9",
54685468 target = "Android-27",
5469- toolchainT = "Android-27-r26c-arm64",
5469+ toolchainT = "Android-27-r26d-arm64",
54705470 opensslConf = "o3_0aa6nV26L27",
54715471 useCMake = "Latest",
54725472 androidSdkVersion = "20240205",
@@ -5500,11 +5500,11 @@ conf.q6_5lx6_aa6nV26 = {
55005500 }
55015501
55025502 conf.q6_5lx6_ax6nV26 = {
5503- name = "Qt6.5.3-Android-x86_64-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
5503+ name = "Qt6.5.3-Android-x86_64-Clang-NDKr26d-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
55045504 qtVersion = "6.5.3",
55055505 host = "Rocky9",
55065506 target = "Android-27",
5507- toolchainT = "Android-27-r26c-x86_64",
5507+ toolchainT = "Android-27-r26d-x86_64",
55085508 opensslConf = "o3_0ax6nV26L27",
55095509 useCMake = "Latest",
55105510 androidSdkVersion = "20240205",
@@ -5538,11 +5538,11 @@ conf.q6_5lx6_ax6nV26 = {
55385538 }
55395539
55405540 conf.q6_5mal_aa3nV26 = {
5541- name = "Qt6.5.3-Android-arm-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
5541+ name = "Qt6.5.3-Android-arm-Clang-NDKr26d-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
55425542 qtVersion = "6.5.3",
55435543 host = "macOSM1",
55445544 target = "Android-27",
5545- toolchainT = "Android-27-r26c-arm",
5545+ toolchainT = "Android-27-r26d-arm",
55465546 opensslConf = "o3_0aa3nV26L27",
55475547 useCMake = "Latest",
55485548 androidSdkVersion = "20240205",
@@ -5576,11 +5576,11 @@ conf.q6_5mal_aa3nV26 = {
55765576 }
55775577
55785578 conf.q6_5mal_aa6nV26 = {
5579- name = "Qt6.5.3-Android-arm64-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
5579+ name = "Qt6.5.3-Android-arm64-Clang-NDKr26d-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
55805580 qtVersion = "6.5.3",
55815581 host = "macOSM1",
55825582 target = "Android-27",
5583- toolchainT = "Android-27-r26c-arm64",
5583+ toolchainT = "Android-27-r26d-arm64",
55845584 opensslConf = "o3_0aa6nV26L27",
55855585 useCMake = "Latest",
55865586 androidSdkVersion = "20240205",
@@ -5614,11 +5614,11 @@ conf.q6_5mal_aa6nV26 = {
56145614 }
56155615
56165616 conf.q6_5mal_ax6nV26 = {
5617- name = "Qt6.5.3-Android-x86_64-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
5617+ name = "Qt6.5.3-Android-x86_64-Clang-NDKr26d-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
56185618 qtVersion = "6.5.3",
56195619 host = "macOSM1",
56205620 target = "Android-27",
5621- toolchainT = "Android-27-r26c-x86_64",
5621+ toolchainT = "Android-27-r26d-x86_64",
56225622 opensslConf = "o3_0ax6nV26L27",
56235623 useCMake = "Latest",
56245624 androidSdkVersion = "20240205",
@@ -6264,12 +6264,12 @@ conf.q6_7malst = {
62646264 }
62656265
62666266 conf.q6_7wx6g3_aa3nV26 = {
6267- name = "Qt6.7.0-Android-arm-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
6267+ name = "Qt6.7.0-Android-arm-Clang-NDKr26d-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
62686268 qtVersion = "6.7.0",
62696269 host = "Win10",
62706270 target = "Android-27",
62716271 toolchain = "MinGW1320-64",
6272- toolchainT = "Android-27-r26c-arm",
6272+ toolchainT = "Android-27-r26d-arm",
62736273 opensslConf = "o3_0aa3nV26L27",
62746274 useCMake = "Latest",
62756275 androidSdkVersion = "20240205",
@@ -6304,12 +6304,12 @@ conf.q6_7wx6g3_aa3nV26 = {
63046304 }
63056305
63066306 conf.q6_7wx6g3_aa6nV26 = {
6307- name = "Qt6.7.0-Android-arm64-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
6307+ name = "Qt6.7.0-Android-arm64-Clang-NDKr26d-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
63086308 qtVersion = "6.7.0",
63096309 host = "Win10",
63106310 target = "Android-27",
63116311 toolchain = "MinGW1320-64",
6312- toolchainT = "Android-27-r26c-arm64",
6312+ toolchainT = "Android-27-r26d-arm64",
63136313 opensslConf = "o3_0aa6nV26L27",
63146314 useCMake = "Latest",
63156315 androidSdkVersion = "20240205",
@@ -6344,12 +6344,12 @@ conf.q6_7wx6g3_aa6nV26 = {
63446344 }
63456345
63466346 conf.q6_7wx6g3_ax6nV26 = {
6347- name = "Qt6.7.0-Android-x86_64-Clang-NDKr26c-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
6347+ name = "Qt6.7.0-Android-x86_64-Clang-NDKr26d-xWindows-x86_64-MinGW&HOSTTOOLVERSION&-msvcrt",
63486348 qtVersion = "6.7.0",
63496349 host = "Win10",
63506350 target = "Android-27",
63516351 toolchain = "MinGW1320-64",
6352- toolchainT = "Android-27-r26c-x86_64",
6352+ toolchainT = "Android-27-r26d-x86_64",
63536353 opensslConf = "o3_0ax6nV26L27",
63546354 useCMake = "Latest",
63556355 androidSdkVersion = "20240205",
@@ -6384,11 +6384,11 @@ conf.q6_7wx6g3_ax6nV26 = {
63846384 }
63856385
63866386 conf.q6_7lx6_aa3nV26 = {
6387- name = "Qt6.7.0-Android-arm-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
6387+ name = "Qt6.7.0-Android-arm-Clang-NDKr26d-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
63886388 qtVersion = "6.7.0",
63896389 host = "Rocky9",
63906390 target = "Android-27",
6391- toolchainT = "Android-27-r26c-arm",
6391+ toolchainT = "Android-27-r26d-arm",
63926392 opensslConf = "o3_0aa3nV26L27",
63936393 useCMake = "Latest",
63946394 androidSdkVersion = "20240205",
@@ -6422,11 +6422,11 @@ conf.q6_7lx6_aa3nV26 = {
64226422 }
64236423
64246424 conf.q6_7lx6_aa6nV26 = {
6425- name = "Qt6.7.0-Android-arm64-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
6425+ name = "Qt6.7.0-Android-arm64-Clang-NDKr26d-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
64266426 qtVersion = "6.7.0",
64276427 host = "Rocky9",
64286428 target = "Android-27",
6429- toolchainT = "Android-27-r26c-arm64",
6429+ toolchainT = "Android-27-r26d-arm64",
64306430 opensslConf = "o3_0aa6nV26L27",
64316431 useCMake = "Latest",
64326432 androidSdkVersion = "20240205",
@@ -6460,11 +6460,11 @@ conf.q6_7lx6_aa6nV26 = {
64606460 }
64616461
64626462 conf.q6_7lx6_ax6nV26 = {
6463- name = "Qt6.7.0-Android-x86_64-Clang-NDKr26c-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
6463+ name = "Qt6.7.0-Android-x86_64-Clang-NDKr26d-xLinux-x86_64-gcc&HOSTTOOLVERSION&",
64646464 qtVersion = "6.7.0",
64656465 host = "Rocky9",
64666466 target = "Android-27",
6467- toolchainT = "Android-27-r26c-x86_64",
6467+ toolchainT = "Android-27-r26d-x86_64",
64686468 opensslConf = "o3_0ax6nV26L27",
64696469 useCMake = "Latest",
64706470 androidSdkVersion = "20240205",
@@ -6498,11 +6498,11 @@ conf.q6_7lx6_ax6nV26 = {
64986498 }
64996499
65006500 conf.q6_7mal_aa3nV26 = {
6501- name = "Qt6.7.0-Android-arm-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
6501+ name = "Qt6.7.0-Android-arm-Clang-NDKr26d-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
65026502 qtVersion = "6.7.0",
65036503 host = "macOSM1",
65046504 target = "Android-27",
6505- toolchainT = "Android-27-r26c-arm",
6505+ toolchainT = "Android-27-r26d-arm",
65066506 opensslConf = "o3_0aa3nV26L27",
65076507 useCMake = "Latest",
65086508 androidSdkVersion = "20240205",
@@ -6536,11 +6536,11 @@ conf.q6_7mal_aa3nV26 = {
65366536 }
65376537
65386538 conf.q6_7mal_aa6nV26 = {
6539- name = "Qt6.7.0-Android-arm64-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
6539+ name = "Qt6.7.0-Android-arm64-Clang-NDKr26d-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
65406540 qtVersion = "6.7.0",
65416541 host = "macOSM1",
65426542 target = "Android-27",
6543- toolchainT = "Android-27-r26c-arm64",
6543+ toolchainT = "Android-27-r26d-arm64",
65446544 opensslConf = "o3_0aa6nV26L27",
65456545 useCMake = "Latest",
65466546 androidSdkVersion = "20240205",
@@ -6574,11 +6574,11 @@ conf.q6_7mal_aa6nV26 = {
65746574 }
65756575
65766576 conf.q6_7mal_ax6nV26 = {
6577- name = "Qt6.7.0-Android-x86_64-Clang-NDKr26c-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
6577+ name = "Qt6.7.0-Android-x86_64-Clang-NDKr26d-xmacOS-Universal-AppleClang&HOSTTOOLVERSION&",
65786578 qtVersion = "6.7.0",
65796579 host = "macOSM1",
65806580 target = "Android-27",
6581- toolchainT = "Android-27-r26c-x86_64",
6581+ toolchainT = "Android-27-r26d-x86_64",
65826582 opensslConf = "o3_0ax6nV26L27",
65836583 useCMake = "Latest",
65846584 androidSdkVersion = "20240205",