configure tweaks for MacOS/Windows

Author: shikokuchuo

configure

@@ -49,6 +49,10 @@ else
   cd nng-$LIB_VER
   mkdir build
   cd build
+  which cmake
+  if [ $? -ne 0 ]; then
+    export PATH=$PATH:/Applications/CMake.app/Contents/bin
+  fi
   cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -DNNG_TESTS=0 ..
   make
   cd ../..
@@ -82,6 +86,10 @@ if [ $? -ne 0 ]; then
     cd nng-$LIB_VER
     mkdir build
     cd build
+    which cmake
+    if [ $? -ne 0 ]; then
+      export PATH=$PATH:/Applications/CMake.app/Contents/bin
+    fi
     cmake -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fPIC" -DNNG_TESTS=0 ..
     make
     cd ../..

src/Makevars.ucrt

@@ -1,2 +1,2 @@
-CRT=-ucrt
+CRT=_ucrt
 include Makevars.win

src/Makevars.win

@@ -1,4 +1,4 @@
-RWINLIB = ../windows/nng-latest
+RWINLIB = ../windows/rwinlib-1.5.2
 
 PKG_CFLAGS=-DNNG_STATIC_LIB -I${RWINLIB}/include $(C_VISIBILITY)
 PKG_LIBS=-L${RWINLIB}/lib${R_ARCH}${CRT} -lnng -lws2_32

tools/winlibs.R

@@ -1,9 +1,9 @@
 # nanonext - Download precompiled libnng for Windows ---------------------------
 
-if (!file.exists("../windows/nng-latest/include/nng.h")) {
+if (!file.exists("../windows/rwinlib-1.5.2/include/nng.h")) {
 
   if (getRversion() < "3.3.0") setInternet2()
-  download.file("https://github.com/shikokuchuo/rwinlib/raw/main/nng-latest.zip", destfile = "nng-latest.zip", quiet = TRUE)
+  download.file("https://github.com/shikokuchuo/rwinlib/archive/refs/tags/v1.5.2.zip", destfile = "nng-latest.zip", quiet = TRUE)
   dir.create("../windows", showWarnings = FALSE)
   unzip("nng-latest.zip", exdir = "../windows")
   unlink("nng-latest.zip")