• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Keine Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-cqtcocoa誰得pythonphprubygameguibathyscaphec翻訳計画中(planning stage)omegatframeworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

Commit MetaInfo

Revision41da7f7c49d038ed52bf3b3395c620021513de26 (tree)
Zeit2022-11-20 23:13:12
AutorFs <Fsu0413@vip....>
CommiterFs

Log Message

我还是想试试

Ändern Zusammenfassung

Diff

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -158,8 +158,7 @@ conf.host.mac = {
158158 ["Latest"] = "/opt/env/android-sdk-mac-20220911/",
159159 },
160160 ["androidNdkPath"] = {
161- ["r21e"] = "/opt/env/android-ndk-r21e/",
162- -- NDK after r23 only distributes as APP bundle, so we install the APP in /Applications.
161+ ["r21e"] = "/Applications/AndroidNDK8568313.app/Contents/NDK/",
163162 ["r23c"] = "/Applications/AndroidNDK8568313.app/Contents/NDK/",
164163 ["r25b"] = "/Applications/AndroidNDK8937393.app/Contents/NDK/",
165164 },
@@ -167,6 +166,7 @@ conf.host.mac = {
167166 ["sourcePackagePath"] = "/opt/sources/",
168167 ["buildRootPath"] = "/opt/build/",
169168 ["emscriptenPath"] = {
169+ ["1.39.8"] = "/opt/env/emsdk-1.39.8/",
170170 ["2.0.14"] = "/opt/env/emsdk-2.0.14/",
171171 ["3.1.6"] = "/opt/env/emsdk-3.1.6/",
172172 ["3.1.14"] = "/opt/env/emsdk-3.1.14/",
--- a/Compile/lib/qtCompile/conf.lua
+++ b/Compile/lib/qtCompile/conf.lua
@@ -1921,7 +1921,7 @@ conf.Q5wx6m8sf = {
19211921 conf.Q5mx6 = {
19221922 name = "Qt5.15.7-macOS-x86_64-AppleClang&HOSTTOOLVERSION&",
19231923 qtVersion = "5.15.7-4",
1924- host = "macOSLegacy",
1924+ host = "macOS1015",
19251925 configureParameter = [[
19261926 -prefix
19271927 &INSTALLROOT&
@@ -1949,15 +1949,14 @@ conf.Q5mx6 = {
19491949 -make-tool
19501950 "make -j$PARALLELNUM"
19511951 -rpath
1952- -skip
1953- qtwebengine
1952+ -webengine-proprietary-codecs
19541953 ]],
19551954 }
19561955
19571956 conf.Q5mx6nf = {
19581957 name = "Qt5.15.7-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework",
19591958 qtVersion = "5.15.7-4",
1960- host = "macOSLegacy",
1959+ host = "macOS1015",
19611960 variant = {"-noFramework"},
19621961 configureParameter = [[
19631962 -prefix
@@ -1986,8 +1985,7 @@ conf.Q5mx6nf = {
19861985 -make-tool
19871986 "make -j$PARALLELNUM"
19881987 -rpath
1989- -skip
1990- qtwebengine
1988+ -webengine-proprietary-codecs
19911989 -no-framework
19921990 ]],
19931991 }
@@ -2100,7 +2098,7 @@ conf.Q5lx6_aalnl = {
21002098 conf.Q5mx6_aalnl = {
21012099 name = "Qt5.15.7-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
21022100 qtVersion = "5.15.7",
2103- host = "macOSLegacy",
2101+ host = "macOS1015",
21042102 target = "Android-21",
21052103 toolchainT = "Android-21-r21e-all",
21062104 opensslConf = "o1aalnl",
@@ -2223,7 +2221,7 @@ conf.Q5lx6_W = {
22232221 conf.Q5mx6_W = {
22242222 name = "Qt5.15.7-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
22252223 qtVersion = "5.15.7",
2226- host = "macOSLegacy",
2224+ host = "macOS1015",
22272225 target = "WebAssembly",
22282226 toolchainT = "emscripten-1.39.8",
22292227 configureParameter = [[