Fix flags

xerial · Sep 24, 2023 · 61f95e9 · 61f95e9
1 parent 66a8b3c
commit 61f95e9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Setup cmake
         uses: jwlawson/[email protected]
         with:
-          cmake-version: '3.27.6'
+          cmake-version: '3.16.x'
       - name: Build native libraries
         run: make clean-native native-all
         env:

diff --git a/Makefile.common b/Makefile.common
@@ -304,10 +304,10 @@ Linux-riscv64_LINKFLAGS := -shared -static-libgcc -static-libstdc++
 Linux-riscv64_LIBNAME   := libsnappyjava.so
 Linux-riscv64_SNAPPY_FLAGS:=
 
-Windows-arm64_CXX       := c++ -arch arm64
+Windows-arm64_CXX       := armv7-w64-mingw32-g++
 Windows-arm64_STRIP     := strip -x
-Windows-arm64_CXXFLAGS  := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -mmacosx-version-min=10.7 -fvisibility=hidden -stdlib=libc++ -std=c++11
-Windows-arm64_LINKFLAGS := -dynamiclib
+Windows-arm64_CXXFLAGS  := -Ilib/inc_mac -I$(JAVA_HOME)/include -O2 -fPIC -march=armv8-a -fvisibility=hidden -D_WIN32 -DNOMINMAX -std=c++11
+Windows-arm64_LINKFLAGS := -shared -Wl,--out-implib,libsnappyjava.dll.a -Wl,--export-all-symbols
 Windows-arm64_LIBNAME   := libsnappyjava.dll