• R/O
  • HTTP
  • SSH
  • HTTPS

SlunkCrypt: 提交

Official SlunkCrypt repository


Commit MetaInfo

修訂5e7b6ebb095685d909b67dec3ec6347c9c08cac6 (tree)
時間2022-06-19 05:30:45
作者LoRd_MuldeR <mulder2@gmx....>
CommiterLoRd_MuldeR

Log Message

Updated Linux build script to better match the officially supported Debian platforms.

Change Summary

差異

--- a/etc/utils/linux/mk-musl.sh
+++ b/etc/utils/linux/mk-musl.sh
@@ -1,5 +1,5 @@
11 #!/bin/bash
2-# sudo apt install crossbuild-essential-{i386,armel,arm64,mips,mips64}
2+# sudo apt install crossbuild-essential-{i386,armel,armhf,arm64,mipsel,mips64el}
33 set -e
44 cd -- "$(dirname -- "${BASH_SOURCE[0]}")"
55
@@ -30,7 +30,8 @@ curl -vkf -o "musl-latest.tar.gz" "https://musl.libc.org/releases/musl-latest.ta
3030
3131 mk_musl x86_64
3232 mk_musl i686 i686-linux-gnu
33-mk_musl arm arm-linux-gnueabi
34-mk_musl aarch64 aarch64-linux-gnu
35-mk_musl mips mips-linux-gnu
36-mk_musl mips64 mips64-linux-gnuabi64
33+mk_musl armel arm-linux-gnueabi
34+mk_musl armhf arm-linux-gnueabihf
35+mk_musl arm64 aarch64-linux-gnu
36+mk_musl mipsel mipsel-linux-gnu
37+mk_musl mips64el mips64el-linux-gnuabi64
--- a/frontend/src/platform.h
+++ b/frontend/src/platform.h
@@ -56,10 +56,18 @@
5656 # define CPU_ARCH "x86"
5757 #elif defined(__aarch64__) || defined(_M_ARM64)
5858 # define CPU_ARCH "arm64"
59+#elif defined(__arm__) && defined(__ARM_FP)
60+# define CPU_ARCH "armhf"
61+#elif defined(__arm__) && defined(__ARMEL__)
62+# define CPU_ARCH "armel"
5963 #elif defined(__arm__) || defined(_M_ARM)
6064 # define CPU_ARCH "arm"
65+#elif defined(__mips__) && defined(__mips64) && defined(_MIPSEL)
66+# define CPU_ARCH "mips64el"
6167 #elif defined(__mips__) && defined(__mips64)
6268 # define CPU_ARCH "mips64"
69+#elif (defined(__mips__) || defined(__mips)) && defined(_MIPSEL)
70+# define CPU_ARCH "mipsel"
6371 #elif defined(__mips__) || defined(__mips)
6472 # define CPU_ARCH "mips"
6573 #else
--- a/gui/Utilities/CPU/CPUCapabilities.cs
+++ b/gui/Utilities/CPU/CPUCapabilities.cs
@@ -323,7 +323,7 @@ namespace com.muldersoft.slunkcrypt.gui.utils.cpu
323323 // P/Invoke methods
324324 // ------------------------------------------------------------------
325325
326- private class Internal
326+ private static class Internal
327327 {
328328 const string DLL_NAME_X86 = "cpu-capabilities-x86.dll";
329329 const string DLL_NAME_X64 = "cpu-capabilities-x64.dll";
--- a/mk-release.sh
+++ b/mk-release.sh
@@ -12,15 +12,21 @@ function mk_slunk() {
1212 cp -vf "frontend/bin/slunkcrypt" "out/slunkcrypt-${1}"
1313 }
1414
15+if [[ "$OSTYPE" != "linux-gnu"* ]]; then
16+ echo "This script is supposed to run on the linux platform !!!"
17+ exit 1
18+fi
19+
1520 rm -rf "out" && mkdir -p "out"
1621
1722 $BASH -x -c "make clean"
1823
19-mk_slunk "i686" "MARCH=pentiumpro MTUNE=generic"
2024 mk_slunk "x86_64" "MARCH=x86-64 MTUNE=nocona"
21-mk_slunk "arm"
22-mk_slunk "aarch64"
23-mk_slunk "mips"
24-mk_slunk "mips64"
25+mk_slunk "i686" "MARCH=pentiumpro MTUNE=pentium3"
26+mk_slunk "armel"
27+mk_slunk "armhf"
28+mk_slunk "arm64"
29+mk_slunk "mipsel"
30+mk_slunk "mips64el"
2531
2632 printf "\033[1;32m\nBuild completed successfully.\033[0m\n\n"
Show on old repository browser