• 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

Revisionafd2c8707dec8769df76ae687ad1221a8fe9d5a1 (tree)
Zeit2022-11-20 23:35:46
AutorFs <Fsu0413@vip....>
CommiterFs

Log Message

Separate M1 mac and Intel mac again

Ändern Zusammenfassung

Diff

--- a/Compile/lib/Configuration.lua
+++ b/Compile/lib/Configuration.lua
@@ -61,7 +61,6 @@ conf.host.win = {
6161 ["emscriptenPath"] = {
6262 ["1.39.8"] = "D:\\emsdk-1.39.8\\",
6363 ["2.0.14"] = "D:\\emsdk-2.0.14\\",
64- ["3.1.6"] = "D:\\emsdk-3.1.6\\",
6564 ["3.1.14"] = "D:\\emsdk-3.1.14\\",
6665 },
6766 ["cMakePath"] = {
@@ -134,7 +133,6 @@ conf.host.linux = {
134133 ["emscriptenPath"] = {
135134 ["1.39.8"] = "/opt/env/emsdk-1.39.8/",
136135 ["2.0.14"] = "/opt/env/emsdk-2.0.14/",
137- ["3.1.6"] = "/opt/env/emsdk-3.1.6/",
138136 ["3.1.14"] = "/opt/env/emsdk-3.1.14/",
139137 },
140138 ["jdkPath"] = {
@@ -154,7 +152,6 @@ conf.host.mac = {
154152 ["makefileTemplate"] = "unix",
155153 ["pathSep"] = '/',
156154 ["androidSdkPath"] = {
157- ["29"] = "/opt/env/android-sdk-mac/",
158155 ["Latest"] = "/opt/env/android-sdk-mac-20220911/",
159156 },
160157 ["androidNdkPath"] = {
@@ -168,7 +165,6 @@ conf.host.mac = {
168165 ["emscriptenPath"] = {
169166 ["1.39.8"] = "/opt/env/emsdk-1.39.8/",
170167 ["2.0.14"] = "/opt/env/emsdk-2.0.14/",
171- ["3.1.6"] = "/opt/env/emsdk-3.1.6/",
172168 ["3.1.14"] = "/opt/env/emsdk-3.1.14/",
173169 },
174170 ["jdkPath"] = {
@@ -178,6 +174,37 @@ conf.host.mac = {
178174 ["defaultToolchainExecutableName"] = "clang",
179175 }
180176
177+conf.host.macM1 = {
178+ -- Preinstalled GNU make in path and is used
179+ -- Preinstalled CMake and ninja in path and is used
180+ -- Preinstalled Android-NDK/SDK toolchain
181+ -- Preinstalled emsdk toolchain
182+ -- Preinstalled host toolchain in path and is used
183+ -- Preinstalled p7zip in path and is used
184+ ["makefileTemplate"] = "unix",
185+ ["pathSep"] = '/',
186+ ["androidSdkPath"] = {
187+ ["Latest"] = "/opt/env/android-sdk-mac-20220911/",
188+ },
189+ ["androidNdkPath"] = {
190+ ["r23c"] = "/Applications/AndroidNDK8568313.app/Contents/NDK/",
191+ ["r25b"] = "/Applications/AndroidNDK8937393.app/Contents/NDK/",
192+ },
193+ ["androidNdkHost"] = "darwin-x86_64",
194+ ["sourcePackagePath"] = "/opt/sources/",
195+ ["buildRootPath"] = "/opt/build/",
196+ ["emscriptenPath"] = {
197+ ["2.0.14"] = "/opt/env/emsdk-2.0.14/",
198+ ["3.1.14"] = "/opt/env/emsdk-3.1.14/",
199+ },
200+ ["jdkPath"] = {
201+ -- It is said that zulu JDK runs faster on M1 chips...
202+ -- If not I'll use OpenJDK from Homebrew later
203+ ["11"] = "/Library/Java/JavaVirtualMachines/zulu-11.jdk/Contents/Home/",
204+ },
205+ ["defaultToolchainExecutableName"] = "clang",
206+}
207+
181208 conf.host.macLegacy = {
182209 -- Preinstalled GNU make in path and is used
183210 -- Preinstalled Android-NDK/SDK toolchain
@@ -197,6 +224,8 @@ conf.host.macLegacy = {
197224 },
198225 ["androidNdkHost"] = "darwin-x86_64",
199226 ["sourcePackagePath"] = "/Volumes/opt/sources/",
227+ -- I'd like to link build folder to /opt/build but I remembered that Qt doesn't allow symlink in build dir before...
228+ -- If the link works there will be no need to distinguish mac and macLegacy
200229 ["buildRootPath"] = "/Volumes/opt/build/",
201230 ["emscriptenPath"] = {
202231 ["1.39.8"] = "/opt/env/emsdk-1.39.8/",
@@ -705,7 +734,7 @@ conf.hostToConfMap = {
705734 ["Rocky9"] = "linux",
706735 ["macOS1015"] = "mac",
707736 ["macOSLegacy"] = "macLegacy",
708- ["macOSM1"] = "mac",
737+ ["macOSM1"] = "macM1",
709738 }
710739
711740 return conf