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

Revisiona82afb033c41ccafadc07adf65e517ace7b6848b (tree)
Zeit2023-02-24 20:31:47
AutorFs <Fsu0413@vip....>
CommiterFs

Log Message

update android sdk

Ändern Zusammenfassung

Diff

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -50,7 +50,8 @@ conf.host.win = {
5050 ["buildRootPath"] = "D:\\Qt\\", -- On Windows, the build root should be same with source package
5151 ["androidSdkPath"] = {
5252 ["29"] = "D:\\android-sdk-windows",
53- ["Latest"] = "D:\\android-sdk-windows-20220911",
53+ ["20220911"] = "D:\\android-sdk-windows-20220911",
54+ ["20230224"] = "D:\\android-sdk-windows-20230224",
5455 },
5556 ["androidNdkPath"] = {
5657 ["r21e"] = "D:\\android-ndk-r21e",
@@ -121,7 +122,8 @@ conf.host.linux = {
121122 ["pathSep"] = '/',
122123 ["androidSdkPath"] = {
123124 ["29"] = "/opt/env/android-sdk-linux/",
124- ["Latest"] = "/opt/env/android-sdk-linux-20220911/",
125+ ["20220911"] = "/opt/env/android-sdk-linux-20220911/",
126+ ["20230224"] = "/opt/env/android-sdk-linux-20230224/",
125127 },
126128 ["androidNdkPath"] = {
127129 ["r21e"] = "/opt/env/android-ndk-r21e/",
@@ -154,7 +156,8 @@ conf.host.mac = {
154156 ["makefileTemplate"] = "unix",
155157 ["pathSep"] = '/',
156158 ["androidSdkPath"] = {
157- ["Latest"] = "/opt/env/android-sdk-mac-20220911/",
159+ ["20220911"] = "/opt/env/android-sdk-mac-20220911/",
160+ ["20230224"] = "/opt/env/android-sdk-mac-20230224/",
158161 },
159162 ["androidNdkPath"] = {
160163 ["r21e"] = "/Applications/AndroidNDK7075529.app/Contents/NDK/",
@@ -186,7 +189,8 @@ conf.host.macM1 = {
186189 ["makefileTemplate"] = "unix",
187190 ["pathSep"] = '/',
188191 ["androidSdkPath"] = {
189- ["Latest"] = "/opt/env/android-sdk-mac-20220911/",
192+ ["20220911"] = "/opt/env/android-sdk-mac-20220911/",
193+ ["20230224"] = "/opt/env/android-sdk-mac-20230224/",
190194 },
191195 ["androidNdkPath"] = {
192196 ["r23c"] = "/Applications/AndroidNDK8568313.app/Contents/NDK/",
@@ -218,7 +222,8 @@ conf.host.macLegacy = {
218222 ["pathSep"] = '/',
219223 ["androidSdkPath"] = {
220224 ["29"] = "/Volumes/opt/env/android-sdk-mac-2/",
221- ["Latest"] = "/Volumes/opt/env/android-sdk-mac-20220911/",
225+ ["20220911"] = "/Volumes/opt/env/android-sdk-mac-20220911/",
226+ ["20230224"] = "/Volumes/opt/env/android-sdk-mac-20230224/",
222227 },
223228 ["androidNdkPath"] = {
224229 ["r21e"] = "/Volumes/opt/env/android-ndk-r21e/",
--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -2100,7 +2100,7 @@ conf.q5_15wx6g8_aalnl = {
21002100 target = "Android-21",
21012101 toolchainT = "Android-21-r21e-all",
21022102 opensslConf = "o1_1aalnl",
2103- androidSdkVersion = "Latest",
2103+ androidSdkVersion = "20220911",
21042104 configureParameter = [[
21052105 -prefix
21062106 /
@@ -2152,7 +2152,7 @@ conf.q5_15lx6_aalnl = {
21522152 target = "Android-21",
21532153 toolchainT = "Android-21-r21e-all",
21542154 opensslConf = "o1_1aalnl",
2155- androidSdkVersion = "Latest",
2155+ androidSdkVersion = "20220911",
21562156 configureParameter = [[
21572157 -prefix
21582158 /
@@ -2204,7 +2204,7 @@ conf.q5_15mx6_aalnl = {
22042204 target = "Android-21",
22052205 toolchainT = "Android-21-r21e-all",
22062206 opensslConf = "o1_1aalnl",
2207- androidSdkVersion = "Latest",
2207+ androidSdkVersion = "20220911",
22082208 configureParameter = [[
22092209 -prefix
22102210 /
@@ -2257,7 +2257,7 @@ conf.q5_15wx6g8_aaln3 = {
22572257 target = "Android-21",
22582258 toolchainT = "Android-21-r23c-all",
22592259 opensslConf = "o1_1aaln321",
2260- androidSdkVersion = "Latest",
2260+ androidSdkVersion = "20220911",
22612261 configureParameter = [[
22622262 -prefix
22632263 /
@@ -2309,7 +2309,7 @@ conf.q5_15lx6_aaln3 = {
23092309 target = "Android-21",
23102310 toolchainT = "Android-21-r23c-all",
23112311 opensslConf = "o1_1aaln321",
2312- androidSdkVersion = "Latest",
2312+ androidSdkVersion = "20220911",
23132313 configureParameter = [[
23142314 -prefix
23152315 /
@@ -2361,7 +2361,7 @@ conf.q5_15mx6_aaln3 = {
23612361 target = "Android-21",
23622362 toolchainT = "Android-21-r23c-all",
23632363 opensslConf = "o1_1aaln321",
2364- androidSdkVersion = "Latest",
2364+ androidSdkVersion = "20220911",
23652365 configureParameter = [[
23662366 -prefix
23672367 /
@@ -3267,7 +3267,7 @@ conf.q6_2wx6g1_aa3n3 = {
32673267 toolchainT = "Android-24-r23c-arm",
32683268 opensslConf = "o3_0aa3n324",
32693269 useCMake = "Latest",
3270- androidSdkVersion = "Latest",
3270+ androidSdkVersion = "20220911",
32713271 configureParameter = [[
32723272 -G"Ninja"
32733273 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3306,7 +3306,7 @@ conf.q6_2wx6g1_aa6n3 = {
33063306 toolchainT = "Android-24-r23c-arm64",
33073307 opensslConf = "o3_0aa6n324",
33083308 useCMake = "Latest",
3309- androidSdkVersion = "Latest",
3309+ androidSdkVersion = "20220911",
33103310 configureParameter = [[
33113311 -G"Ninja"
33123312 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3345,7 +3345,7 @@ conf.q6_2wx6g1_ax3n3 = {
33453345 toolchainT = "Android-24-r23c-x86",
33463346 opensslConf = "o3_0ax3n324",
33473347 useCMake = "Latest",
3348- androidSdkVersion = "Latest",
3348+ androidSdkVersion = "20220911",
33493349 configureParameter = [[
33503350 -G"Ninja"
33513351 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3384,7 +3384,7 @@ conf.q6_2wx6g1_ax6n3 = {
33843384 toolchainT = "Android-24-r23c-x86_64",
33853385 opensslConf = "o3_0ax6n324",
33863386 useCMake = "Latest",
3387- androidSdkVersion = "Latest",
3387+ androidSdkVersion = "20220911",
33883388 configureParameter = [[
33893389 -G"Ninja"
33903390 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3422,7 +3422,7 @@ conf.q6_2lx6_aa3n3 = {
34223422 toolchainT = "Android-24-r23c-arm",
34233423 opensslConf = "o3_0aa3n324",
34243424 useCMake = "Latest",
3425- androidSdkVersion = "Latest",
3425+ androidSdkVersion = "20220911",
34263426 configureParameter = [[
34273427 -G"Ninja"
34283428 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3459,7 +3459,7 @@ conf.q6_2lx6_aa6n3 = {
34593459 toolchainT = "Android-24-r23c-arm64",
34603460 opensslConf = "o3_0aa6n324",
34613461 useCMake = "Latest",
3462- androidSdkVersion = "Latest",
3462+ androidSdkVersion = "20220911",
34633463 configureParameter = [[
34643464 -G"Ninja"
34653465 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3496,7 +3496,7 @@ conf.q6_2lx6_ax3n3 = {
34963496 toolchainT = "Android-24-r23c-x86",
34973497 opensslConf = "o3_0ax3n324",
34983498 useCMake = "Latest",
3499- androidSdkVersion = "Latest",
3499+ androidSdkVersion = "20220911",
35003500 configureParameter = [[
35013501 -G"Ninja"
35023502 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3533,7 +3533,7 @@ conf.q6_2lx6_ax6n3 = {
35333533 toolchainT = "Android-24-r23c-x86_64",
35343534 opensslConf = "o3_0ax6n324",
35353535 useCMake = "Latest",
3536- androidSdkVersion = "Latest",
3536+ androidSdkVersion = "20220911",
35373537 configureParameter = [[
35383538 -G"Ninja"
35393539 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3570,7 +3570,7 @@ conf.q6_2mal_aa3n3 = {
35703570 toolchainT = "Android-24-r23c-arm",
35713571 opensslConf = "o3_0aa3n324",
35723572 useCMake = "Latest",
3573- androidSdkVersion = "Latest",
3573+ androidSdkVersion = "20220911",
35743574 configureParameter = [[
35753575 -G"Ninja"
35763576 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3607,7 +3607,7 @@ conf.q6_2mal_aa6n3 = {
36073607 toolchainT = "Android-24-r23c-arm64",
36083608 opensslConf = "o3_0aa6n324",
36093609 useCMake = "Latest",
3610- androidSdkVersion = "Latest",
3610+ androidSdkVersion = "20220911",
36113611 configureParameter = [[
36123612 -G"Ninja"
36133613 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3644,7 +3644,7 @@ conf.q6_2mal_ax3n3 = {
36443644 toolchainT = "Android-24-r23c-x86",
36453645 opensslConf = "o3_0ax3n324",
36463646 useCMake = "Latest",
3647- androidSdkVersion = "Latest",
3647+ androidSdkVersion = "20220911",
36483648 configureParameter = [[
36493649 -G"Ninja"
36503650 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -3681,7 +3681,7 @@ conf.q6_2mal_ax6n3 = {
36813681 toolchainT = "Android-24-r23c-x86_64",
36823682 opensslConf = "o3_0ax6n324",
36833683 useCMake = "Latest",
3684- androidSdkVersion = "Latest",
3684+ androidSdkVersion = "20220911",
36853685 configureParameter = [[
36863686 -G"Ninja"
36873687 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -4371,7 +4371,7 @@ conf.q6_4wx6g2_aa6n5 = {
43714371 toolchainT = "Android-27-r25c-arm64",
43724372 opensslConf = "o3_0aa6n527",
43734373 useCMake = "Latest",
4374- androidSdkVersion = "Latest",
4374+ androidSdkVersion = "20220911",
43754375 configureParameter = [[
43764376 -G"Ninja"
43774377 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -4410,7 +4410,7 @@ conf.q6_4wx6g2_ax6n5 = {
44104410 toolchainT = "Android-27-r25c-x86_64",
44114411 opensslConf = "o3_0ax6n527",
44124412 useCMake = "Latest",
4413- androidSdkVersion = "Latest",
4413+ androidSdkVersion = "20220911",
44144414 configureParameter = [[
44154415 -G"Ninja"
44164416 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -4448,7 +4448,7 @@ conf.q6_4lx6_aa6n5 = {
44484448 toolchainT = "Android-27-r25c-arm64",
44494449 opensslConf = "o3_0aa6n527",
44504450 useCMake = "Latest",
4451- androidSdkVersion = "Latest",
4451+ androidSdkVersion = "20220911",
44524452 configureParameter = [[
44534453 -G"Ninja"
44544454 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -4485,7 +4485,7 @@ conf.q6_4lx6_ax6n5 = {
44854485 toolchainT = "Android-27-r25c-x86_64",
44864486 opensslConf = "o3_0ax6n527",
44874487 useCMake = "Latest",
4488- androidSdkVersion = "Latest",
4488+ androidSdkVersion = "20220911",
44894489 configureParameter = [[
44904490 -G"Ninja"
44914491 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -4522,7 +4522,7 @@ conf.q6_4mal_aa6n5 = {
45224522 toolchainT = "Android-27-r25c-arm64",
45234523 opensslConf = "o3_0aa6n527",
45244524 useCMake = "Latest",
4525- androidSdkVersion = "Latest",
4525+ androidSdkVersion = "20220911",
45264526 configureParameter = [[
45274527 -G"Ninja"
45284528 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -4559,7 +4559,7 @@ conf.q6_4mal_ax6n5 = {
45594559 toolchainT = "Android-27-r25c-x86_64",
45604560 opensslConf = "o3_0ax6n527",
45614561 useCMake = "Latest",
4562- androidSdkVersion = "Latest",
4562+ androidSdkVersion = "20220911",
45634563 configureParameter = [[
45644564 -G"Ninja"
45654565 -DCMAKE_INSTALL_PREFIX=&INSTALLROOT&
@@ -5361,7 +5361,7 @@ conf.q6_5wx6g2_aa6n5 = {
53615361 toolchainT = "Android-27-r25c-arm64",
53625362 opensslConf = "o3_0aa6n527",
53635363 useCMake = "Latest",
5364- androidSdkVersion = "Latest",
5364+ androidSdkVersion = "20230224",
53655365 isPreview = true,
53665366 configureParameter = [[
53675367 -G"Ninja"
@@ -5401,7 +5401,7 @@ conf.q6_5wx6g2_ax6n5 = {
54015401 toolchainT = "Android-27-r25c-x86_64",
54025402 opensslConf = "o3_0ax6n527",
54035403 useCMake = "Latest",
5404- androidSdkVersion = "Latest",
5404+ androidSdkVersion = "20230224",
54055405 isPreview = true,
54065406 configureParameter = [[
54075407 -G"Ninja"
@@ -5440,7 +5440,7 @@ conf.q6_5lx6_aa6n5 = {
54405440 toolchainT = "Android-27-r25c-arm64",
54415441 opensslConf = "o3_0aa6n527",
54425442 useCMake = "Latest",
5443- androidSdkVersion = "Latest",
5443+ androidSdkVersion = "20230224",
54445444 isPreview = true,
54455445 configureParameter = [[
54465446 -G"Ninja"
@@ -5478,7 +5478,7 @@ conf.q6_5lx6_ax6n5 = {
54785478 toolchainT = "Android-27-r25c-x86_64",
54795479 opensslConf = "o3_0ax6n527",
54805480 useCMake = "Latest",
5481- androidSdkVersion = "Latest",
5481+ androidSdkVersion = "20230224",
54825482 isPreview = true,
54835483 configureParameter = [[
54845484 -G"Ninja"
@@ -5516,7 +5516,7 @@ conf.q6_5mal_aa6n5 = {
55165516 toolchainT = "Android-27-r25c-arm64",
55175517 opensslConf = "o3_0aa6n527",
55185518 useCMake = "Latest",
5519- androidSdkVersion = "Latest",
5519+ androidSdkVersion = "20230224",
55205520 isPreview = true,
55215521 configureParameter = [[
55225522 -G"Ninja"
@@ -5554,7 +5554,7 @@ conf.q6_5mal_ax6n5 = {
55545554 toolchainT = "Android-27-r25c-x86_64",
55555555 opensslConf = "o3_0ax6n527",
55565556 useCMake = "Latest",
5557- androidSdkVersion = "Latest",
5557+ androidSdkVersion = "20230224",
55585558 isPreview = true,
55595559 configureParameter = [[
55605560 -G"Ninja"