• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

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

Commit MetaInfo

Révisionfd4911796032b566fec99605d7bbdb43cdf1d8fc (tree)
l'heure2022-11-19 23:15:12
AuteurFs <Fsu0413@vip....>
CommiterFs

Message de Log

我草

Change Summary

Modification

--- a/qt6_deploy_host.sh
+++ b/qt6_deploy_host.sh
@@ -61,11 +61,24 @@ chmod +x "${PATH_TO_TARGET}/bin/qmake"
6161
6262 chmod +x "${PATH_TO_TARGET}/bin/qtpaths"
6363
64-sed -i -e 's,^HostPrefix=.*$,HostPrefix=../host,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
65-sed -i -e 's,^HostData=.*$,HostData=..,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
64+sed -i '' -e 's,^HostPrefix=.*$,HostPrefix=../host,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
65+sed -i '' -e 's,^HostData=.*$,HostData=..,g' "${PATH_TO_TARGET}/bin/target_qt.conf"
6666
67-# CMake tweak
67+# CMake tweak / Qt 6.4.1 +
6868
69-sed -i -e 's,^set(__qt_platform_initial_qt_host_path[[:space:]].*$,set(__qt_platform_initial_qt_host_path "${Qt6_DIR}/../../../host"),' "${PATH_TO_TARGET}/lib/cmake/Qt6/Qt6Dependencies.cmake"
70-sed -i -e 's,^set(__qt_platform_initial_qt_host_path_cmake_dir[[:space:]].*$,set(__qt_platform_initial_qt_host_path "${Qt6_DIR}/../../../host/lib/cmake"),' "${PATH_TO_TARGET}/lib/cmake/Qt6/Qt6Dependencies.cmake"
69+sed -i '' -e 's,^set(__qt_platform_initial_qt_host_path[[:space:]].*$,set(__qt_platform_initial_qt_host_path "${Qt6_DIR}/../../../host"),' "${PATH_TO_TARGET}/lib/cmake/Qt6/Qt6Dependencies.cmake"
70+sed -i '' -e 's,^set(__qt_platform_initial_qt_host_path_cmake_dir[[:space:]].*$,set(__qt_platform_initial_qt_host_path_cmake_dir "${Qt6_DIR}/../../../host/lib/cmake"),' "${PATH_TO_TARGET}/lib/cmake/Qt6/Qt6Dependencies.cmake"
7171
72+# CMake tweak / Qt 6.2.4
73+
74+sed -i '' -e '/^set(__qt_toolchain_initial_qt_host_path[[:space:]]*$/{N
75+c\
76+set(__qt_platform_initial_qt_host_path "${CMAKE_CURRENT_LIST_DIR}/../../../host")
77+d
78+}' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"
79+
80+sed -i '' -e '/^set(__qt_platform_initial_qt_host_path_cmake_dir[[:space:]]*$/{N
81+c\
82+set(__qt_platform_initial_qt_host_path_cmake_dir "${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake")
83+d
84+}' "${PATH_TO_TARGET}/lib/cmake/Qt6/qt.toolchain.cmake"
--- a/qt6_deploy_host.vbs
+++ b/qt6_deploy_host.vbs
@@ -75,7 +75,7 @@ target_qtconfold.Close
7575 fso.DeleteFile PATH_TO_TARGET & "\bin\target_qt.conf"
7676 fso.MoveFile PATH_TO_TARGET & "\bin\target_qt.conf.new", PATH_TO_TARGET & "\bin\target_qt.conf"
7777
78-' CMake tweak
78+' CMake tweak / Qt 6.4.1 +
7979
8080 Dim Qt6Dependencies_cmake
8181 Dim Qt6Dependencies_cmakeold
@@ -95,6 +95,32 @@ Qt6Dependencies_cmakeold.Close
9595 fso.DeleteFile PATH_TO_TARGET & "\lib\cmake\Qt6\Qt6Dependencies.cmake"
9696 fso.MoveFile PATH_TO_TARGET & "\lib\cmake\Qt6\Qt6Dependencies.cmake.new", PATH_TO_TARGET & "\lib\cmake\Qt6\Qt6Dependencies.cmake"
9797
98+' CMake tweak / Qt 6.2.4
99+
100+Dim qt_toolchain_cmake
101+Dim qt_toolchain_cmakeold
102+Set qt_toolchain_cmake = fso.OpenTextFile(PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake.new", 2, True)
103+Set qt_toolchain_cmakeold = fso.OpenTextFile(PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake", 1, False)
104+
105+Do until qt_toolchain_cmakeold.AtEndOfStream
106+ line = qt_toolchain_cmakeold.ReadLine
107+ If Left(Trim(line), 38) = "set(__qt_platform_initial_qt_host_path" Then
108+ line = "set(__qt_platform_initial_qt_host_path ""${CMAKE_CURRENT_LIST_DIR}/../../../host"")"
109+ qt_toolchain_cmakeold.ReadLine ' Qt 6.2.4 intentionally put the path to next line. It should be skipped.
110+ End If
111+ If Left(Trim(line), 48) = "set(__qt_platform_initial_qt_host_path_cmake_dir" Then
112+ line = "set(__qt_platform_initial_qt_host_path_cmake_dir ""${CMAKE_CURRENT_LIST_DIR}/../../../host/lib/cmake"")"
113+ qt_toolchain_cmakeold.ReadLine
114+ End If
115+ qt_toolchain_cmake.WriteLine line
116+Loop
117+
118+qt_toolchain_cmake.Close
119+qt_toolchain_cmakeold.Close
120+
121+fso.DeleteFile PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake"
122+fso.MoveFile PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake.new", PATH_TO_TARGET & "\lib\cmake\Qt6\qt.toolchain.cmake"
123+
98124 ' lib/cmake/Qt6/QtBuildInternalsExtra.cmake
99125 ' Does this need to be modified? This is the install directory!
100126 ' Our Qt builds are relocatable so it seems like there is no way that the file needs to be modified