itry to fix builds

PPUC · Mar 8, 2024 · ce4ca18 · ce4ca18
1 parent 34dc1b9
commit ce4ca18
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/platforms/android/arm64-v8a/external.sh b/platforms/android/arm64-v8a/external.sh
@@ -42,12 +42,17 @@ curl -sL https://github.com/likle/cargs/archive/${LIBCARGS_SHA}.zip -o cargs.zip
 unzip cargs.zip
 cd cargs-${LIBCARGS_SHA}
 cp include/cargs.h ../../third-party/include/
-mkdir build
-cd build
-cmake -DBUILD_SHARED_LIBS=ON ..
-make
-cp -P libcargs.so* ../../../third-party/runtime-libs/android/arm64-v8a/
-cd ../..
+cmake -DBUILD_SHARED_LIBS=ON \
+   -DCMAKE_SYSTEM_NAME=Android \
+   -DCMAKE_SYSTEM_VERSION=30 \
+   -DCMAKE_ANDROID_ARCH_ABI=arm64-v8a \
+   -DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE \
+   -DCMAKE_INSTALL_RPATH="\$ORIGIN" \
+   -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
+   -B build
+cmake --build build -- -j${NUM_PROCS}
+cp build/libcargs.so ../../third-party/runtime-libs/android/arm64-v8a/
+cd ..
 
 #
 # build libzedmd and copy to external

diff --git a/platforms/win/x64/cargs/001.patch b/platforms/win/x64/cargs/001.patch
@@ -6,9 +6,8 @@ index b6f828f..6be0845 100644
  set(CMAKE_C_STANDARD 11)
 
  # setup target and directory names
--set(LIBRARY_TARGET "cargs64")
-+set(LIBRARY_TARGET "cargs")
+-set(LIBRARY_TARGET "cargs")
++set(LIBRARY_TARGET "cargs64")
  set(INCLUDE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/include")
  set(SOURCE_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src")
 
-