aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Harrison <adamdharrison@gmail.com>2023-01-16 22:01:07 -0500
committerAdam Harrison <adamdharrison@gmail.com>2023-01-16 22:01:07 -0500
commit84fc6926b8b30518e6ec57c16f3a5d8129a98e11 (patch)
tree0f481e9c35c81d3f49f0179d2503c054098bcf61
parentc3fbf08203dd70e782b94d9fee989b1998ce9d73 (diff)
downloadlite-xl-plugin-manager-84fc6926b8b30518e6ec57c16f3a5d8129a98e11.tar.gz
lite-xl-plugin-manager-84fc6926b8b30518e6ec57c16f3a5d8129a98e11.zip
Updated build, and release.
-rw-r--r--.github/workflows/build.yml2
-rwxr-xr-xbuild.sh2
-rw-r--r--src/lpm.c4
3 files changed, 6 insertions, 2 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fcda1ea..ff69f93 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,7 @@ jobs:
# dpkg-deb --build --root-owner-group $NAME
- name: Build Windows
run: |
- sudo apt-get install mingw-w64 && ./build.sh clean && CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-gcc-ar WINDRES=x86_64-w64-mingw32-windres CMAKE_DEFAULT_FLAGS="-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=NEVER -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_INCLUDE_PATH=/usr/share/mingw-w64/include" LZMA_CONFIGURE="--host=x86_64-w64-mingw32" GIT2_CONFIGURE="-DDLLTOOL=x86_64-w64-mingw32-dlltool" ./build.sh -DLPM_STATIC -DLPM_VERSION='"'$VERSION-x86_64-windows'"' && zip -r lpm-$VERSION-x86_64-windows.zip lpm.exe
+ sudo apt-get install mingw-w64 && ./build.sh clean && CC=x86_64-w64-mingw32-gcc AR=x86_64-w64-mingw32-gcc-ar WINDRES=x86_64-w64-mingw32-windres CMAKE_DEFAULT_FLAGS="-DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_LIBRARY=NEVER -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE=NEVER -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_SYSTEM_NAME=Windows -DCMAKE_SYSTEM_INCLUDE_PATH=/usr/share/mingw-w64/include" LZMA_CONFIGURE="--host=x86_64-w64-mingw32" GIT2_CONFIGURE="-DDLLTOOL=x86_64-w64-mingw32-dlltool" ./build.sh -DLPM_STATIC -DLPM_VERSION='"'$VERSION-x86_64-windows'"' && zip -r lpm-$FULL_VERSION-x86_64-windows.zip lpm.exe
cp lpm.exe lpm.x86_64-windows.exe
- name: Create Release(s)
env: { GITHUB_TOKEN: "${{ github.token }}" }
diff --git a/build.sh b/build.sh
index 5bfbff1..6a6f3d4 100755
--- a/build.sh
+++ b/build.sh
@@ -22,7 +22,7 @@ if [[ "$@" != *"-lz"* ]]; then
LDFLAGS="$LDFLAGS -lz"
fi
if [[ "$@" != *"-lmbedtls"* && "$@" != *"-lmbedcrypto"* ]]; then
- [ ! -e "lib/mbedtls-2.27.0/build" ] && cd lib/mbedtls-2.27.0 && mkdir build && cd build && CFLAGS="$CFLAGS_MBEDTLS -DMBEDTLS_MD4_C=1 -w" cmake .. $CMAKE_DEFAULT_FLAGS -G "Unix Makefiles" -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF $SSL_CONFIGURE && CFLAGS="$CFLAGS_MBEDTLS -DMBEDTLS_MD4_C=1 -w" $MAKE -j $JOBS && $MAKE install && cd ../../../
+ [ ! -e "lib/mbedtls-2.27.0/build" ] && cd lib/mbedtls-2.27.0 && mkdir build && cd build && CFLAGS="$CFLAGS_MBEDTLS -DMBEDTLS_MD4_C=1 -w" cmake .. $CMAKE_DEFAULT_FLAGS -G "Unix Makefiles" -DENABLE_TESTING=OFF -DENABLE_PROGRAMS=OFF $SSL_CONFIGURE && CFLAGS="$CFLAGS $CFLAGS_MBEDTLS -DMBEDTLS_MD4_C=1 -w" $MAKE -j $JOBS && $MAKE install && cd ../../../
LDFLAGS="$LDFLAGS -lmbedtls -lmbedx509 -lmbedcrypto"
fi
if [[ "$@" != *"-lgit2"* ]]; then
diff --git a/src/lpm.c b/src/lpm.c
index bd08403..7e4fdc7 100644
--- a/src/lpm.c
+++ b/src/lpm.c
@@ -1009,6 +1009,10 @@ static const luaL_Reg system_lib[] = {
#define ARCH_PROCESSOR "x86_64"
#elif __i386__
#define ARCH_PROCESSOR "x86"
+ #elif __aarch64__
+ #define ARCH_PROCESSOR "aarch64"
+ #elif __arm__
+ #define ARCH_PROCESSOR "arm"
#else
#error "Please define -DARCH_PROCESSOR."
#endif