diff --git a/native/compile-linux.sh b/native/compile-linux.sh index 5442dce9..bf2c336c 100755 --- a/native/compile-linux.sh +++ b/native/compile-linux.sh @@ -13,13 +13,13 @@ fi echo "Compiling libdeflate..." cd libdeflate || exit -CFLAGS="-fPIC -O2 -fomit-frame-pointer" make +cmake -B build && cmake --build build --target libdeflate_static cd .. CFLAGS="-O2 -I$JAVA_HOME/include/ -I$JAVA_HOME/include/linux/ -fPIC -shared -Wl,-z,noexecstack -Wall -Werror -fomit-frame-pointer" ARCH=$(uname -m) mkdir -p src/main/resources/linux_$ARCH $CC $CFLAGS -Ilibdeflate src/main/c/jni_util.c src/main/c/jni_zlib_deflate.c src/main/c/jni_zlib_inflate.c \ - libdeflate/libdeflate.a -o src/main/resources/linux_$ARCH/velocity-compress.so + libdeflate/build/libdeflate.a -o src/main/resources/linux_$ARCH/velocity-compress.so $CC $CFLAGS -shared src/main/c/jni_util.c src/main/c/jni_cipher_openssl.c \ -o src/main/resources/linux_$ARCH/velocity-cipher.so -lcrypto \ No newline at end of file diff --git a/native/compile-macos.sh b/native/compile-macos.sh index 8beb27eb..732c1a16 100755 --- a/native/compile-macos.sh +++ b/native/compile-macos.sh @@ -11,13 +11,13 @@ fi echo "Compiling libdeflate..." cd libdeflate || exit -CFLAGS="-fPIC -O2 -fomit-frame-pointer" make +cmake -B build && cmake --build build --target libdeflate_static cd .. CFLAGS="-O2 -I$JAVA_HOME/include/ -I$JAVA_HOME/include/darwin/ -fPIC -shared -Wall -Werror -fomit-frame-pointer" ARCH=$(uname -m) mkdir -p src/main/resources/macos_$ARCH $CC $CFLAGS -Ilibdeflate src/main/c/jni_util.c src/main/c/jni_zlib_deflate.c src/main/c/jni_zlib_inflate.c \ - libdeflate/libdeflate.a -o src/main/resources/macos_$ARCH/velocity-compress.dylib + libdeflate/build/libdeflate.a -o src/main/resources/macos_$ARCH/velocity-compress.dylib $CC $CFLAGS -shared src/main/c/jni_util.c src/main/c/jni_cipher_macos.c \ -o src/main/resources/macos_$ARCH/velocity-cipher.dylib -lSystem \ No newline at end of file diff --git a/native/src/main/resources/linux_aarch64/velocity-compress.so b/native/src/main/resources/linux_aarch64/velocity-compress.so index 284450dd..2f600e18 100755 Binary files a/native/src/main/resources/linux_aarch64/velocity-compress.so and b/native/src/main/resources/linux_aarch64/velocity-compress.so differ diff --git a/native/src/main/resources/macos_arm64/velocity-cipher.dylib b/native/src/main/resources/macos_arm64/velocity-cipher.dylib index ba6883dd..1640b385 100755 Binary files a/native/src/main/resources/macos_arm64/velocity-cipher.dylib and b/native/src/main/resources/macos_arm64/velocity-cipher.dylib differ diff --git a/native/src/main/resources/macos_arm64/velocity-compress.dylib b/native/src/main/resources/macos_arm64/velocity-compress.dylib index 5ba6b4f0..333c62e6 100755 Binary files a/native/src/main/resources/macos_arm64/velocity-compress.dylib and b/native/src/main/resources/macos_arm64/velocity-compress.dylib differ