aboutsummaryrefslogtreecommitdiff
path: root/build.sh
diff options
context:
space:
mode:
authorAdam Harrison <adamdharrison@gmail.com>2022-11-29 23:21:59 -0500
committerAdam Harrison <adamdharrison@gmail.com>2022-11-29 23:21:59 -0500
commit560ab6869044a73c1245e619437911830daa97c5 (patch)
treef331ede9d0d4a384cde4cd24ba5a0d9000bf9ca6 /build.sh
parent4ccf28d2a2ab199d8f21ee9d7d5725e6f6acf885 (diff)
downloadlite-xl-plugin-manager-remove-libarchive.tar.gz
lite-xl-plugin-manager-remove-libarchive.zip
Put in microtar from rxi instead of libtar, because libtar isn't portable.remove-libarchive
Diffstat (limited to 'build.sh')
-rwxr-xr-xbuild.sh7
1 files changed, 2 insertions, 5 deletions
diff --git a/build.sh b/build.sh
index bde63a2..31b5dce 100755
--- a/build.sh
+++ b/build.sh
@@ -16,7 +16,7 @@ CMAKE_DEFAULT_FLAGS=" $CMAKE_DEFAULT_FLAGS -DCMAKE_BUILD_TYPE=Release -DCMAKE_PR
mkdir -p lib/prefix/include lib/prefix/lib
if [[ "$@" != *"-lz"* ]]; then
[ ! -e "lib/zlib" ] && echo "Make sure you've cloned submodules. (git submodule update --init --depth=1)" && exit -1
- [[ ! -e "lib/zlib/build" && $OSTYPE != 'msys'* ]] && cd lib/zlib && mkdir build && cd build && ../configure --prefix=`pwd`/../../prefix && $MAKE -j $JOBS && $MAKE install && cd ../../../
+ [[ ! -e "lib/zlib/build" && $OSTYPE != 'msys'* ]] && cd lib/zlib && mkdir build && cd build && ../configure --static --prefix=`pwd`/../../prefix && $MAKE -j $JOBS && $MAKE install && cd ../../../
[[ ! -e "lib/zlib/build" && $OSTYPE == 'msys'* ]] && cd lib/zlib && mkdir build && $MAKE -f ../win32/Makefile.gcc -j $JOBS && cp *.a ../prefix/lib && cp *.h ../prefix/include && cd ../../
LDFLAGS="$LDFLAGS -l:libz.a"
fi
@@ -32,10 +32,7 @@ if [[ "$@" != *"-lzip"* ]]; then
[ ! -e "lib/libzip/build" ] && cd lib/libzip && mkdir build && cd build && cmake .. -G "Unix Makefiles" $CMAKE_DEFAULT_FLAGS -DBUILD_TOOLS=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF -DENABLE_COMMONCRYPTO=OFF -DENABLE_GNUTLS=OFF -DENABLE_OPENSSL=OFF -DENABLE_BZIP2=OFF -DENABLE_LZMA=OFF -DENABLE_ZSTD=OFF && $MAKE -j $JOBS && $MAKE install && cd ../../../
LDFLAGS="$LDFLAGS -l:libzip.a"
fi
-if [[ "$@" != *"-ltar"* ]]; then
- [ ! -e "lib/libtar/build" ] && cd lib/libtar && mkdir build && autoreconf --force --install && cd build && ../configure --prefix=`pwd`/../../prefix && $MAKE -j $JOBS && $MAKE install && cd ../../../
- LDFLAGS="$LDFLAGS -l:libtar.a"
-fi
+[[ "$@" != *"-lmicrotar"* ]] && CFLAGS="$CFLAGS -Ilib/microtar/src" && SRCS="$SRCS lib/microtar/src/microtar.c"
[[ "$@" != *"-llua"* ]] && CFLAGS="$CFLAGS -Ilib/lua -DMAKE_LIB=1" && SRCS="$SRCS lib/lua/onelua.c"
# Build the pre-packaged lua file into the executbale.