Commit: 41da7f7c49d038ed52bf3b3395c620021513de26 - Fs-scripts (git)

Commit MetaInfo

• Revision: 41da7f7c49d038ed52bf3b3395c620021513de26 (tree)
• Time: 2022-11-20 23:13:12
• Author: Fs <Fsu0413@vip....>
• Commiter: Fs

Log Message

我还是想试试

Change Summary

• modified: Compile/lib/Configuration.lua
• modified: Compile/lib/qtCompile/conf.lua

Incremental Difference

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -158,8 +158,7 @@ conf.host.mac = {
 		["Latest"] = "/opt/env/android-sdk-mac-20220911/",
 	},
 	["androidNdkPath"] = {
-		["r21e"] = "/opt/env/android-ndk-r21e/",
-		-- NDK after r23 only distributes as APP bundle, so we install the APP in /Applications.
+		["r21e"] = "/Applications/AndroidNDK8568313.app/Contents/NDK/",
 		["r23c"] = "/Applications/AndroidNDK8568313.app/Contents/NDK/",
 		["r25b"] = "/Applications/AndroidNDK8937393.app/Contents/NDK/",
 	},
@@ -167,6 +166,7 @@ conf.host.mac = {
 	["sourcePackagePath"] = "/opt/sources/",
 	["buildRootPath"] = "/opt/build/",
 	["emscriptenPath"] = {
+		["1.39.8"] = "/opt/env/emsdk-1.39.8/",
 		["2.0.14"] = "/opt/env/emsdk-2.0.14/",
 		["3.1.6"] = "/opt/env/emsdk-3.1.6/",
 		["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 = {
 conf.Q5mx6 = {
 	name = "Qt5.15.7-macOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.7-4",
-	host = "macOSLegacy",
+	host = "macOS1015",
 	configureParameter = [[
 		-prefix
 		&INSTALLROOT&
@@ -1949,15 +1949,14 @@ conf.Q5mx6 = {
 		-make-tool
 		"make -j$PARALLELNUM"
 		-rpath
-		-skip
-		qtwebengine
+		-webengine-proprietary-codecs
 	]],
 }
 
 conf.Q5mx6nf = {
 	name = "Qt5.15.7-macOS-x86_64-AppleClang&HOSTTOOLVERSION&-noFramework",
 	qtVersion = "5.15.7-4",
-	host = "macOSLegacy",
+	host = "macOS1015",
 	variant = {"-noFramework"},
 	configureParameter = [[
 		-prefix
@@ -1986,8 +1985,7 @@ conf.Q5mx6nf = {
 		-make-tool
 		"make -j$PARALLELNUM"
 		-rpath
-		-skip
-		qtwebengine
+		-webengine-proprietary-codecs
 		-no-framework
 	]],
 }
@@ -2100,7 +2098,7 @@ conf.Q5lx6_aalnl = {
 conf.Q5mx6_aalnl = {
 	name = "Qt5.15.7-Android-ALL-Clang-NDKr21e-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.7",
-	host = "macOSLegacy",
+	host = "macOS1015",
 	target = "Android-21",
 	toolchainT = "Android-21-r21e-all",
 	opensslConf = "o1aalnl",
@@ -2223,7 +2221,7 @@ conf.Q5lx6_W = {
 conf.Q5mx6_W = {
 	name = "Qt5.15.7-WebAssembly-emscripten&TARGETTOOLVERSION&-xmacOS-x86_64-AppleClang&HOSTTOOLVERSION&",
 	qtVersion = "5.15.7",
-	host = "macOSLegacy",
+	host = "macOS1015",
 	target = "WebAssembly",
 	toolchainT = "emscripten-1.39.8",
 	configureParameter = [[