streamline windows build system

Author: shikokuchuo

cleanup.ucrt

@@ -2,10 +2,6 @@
 
 LIB_VER="1.18.2"
 
-# Initialise
-PKG_CFLAGS=""
-PKG_LIBS="-Wl,-Bstatic -lfswatch -lstdc++ -lstdc++fs -pthread -Wl,-Bdynamic"
-
 # Find compiler and export flags
 CC=`"${R_HOME}/bin/R" CMD config CC`
 export CC
@@ -18,18 +14,5 @@ cmake --build . --target install
 cd ..
 rm -rf fswatch-$LIB_VER
 
-if [ -d "install/lib64" ]
-then
-PKG_CFLAGS="-I../install/include $PKG_CFLAGS"
-PKG_LIBS="-L../install/lib64 $PKG_LIBS"
-elif [ -d "install/lib" ]
-then
-PKG_CFLAGS="-I../install/include $PKG_CFLAGS"
-PKG_LIBS="-L../install/lib $PKG_LIBS"
-fi
-
-# Write to Makevars
-sed -e "s|@cflags@|$PKG_CFLAGS|" -e "s|@libs@|$PKG_LIBS|" src/Makevars.in > src/Makevars
-
 # Success
 exit 0

configure.ucrt

@@ -0,0 +1,2 @@
+PKG_CFLAGS=-I../install/include $(C_VISIBILITY)
+PKG_LIBS=-L../install/lib -lfswatch -lstdc++ -static-libgcc -static-libstdc++ -pthread

configure.win

@@ -0,0 +1,2 @@
+PKG_CFLAGS=-I../install/include $(C_VISIBILITY)
+PKG_LIBS=-L../install/lib -Wl,-Bstatic -lfswatch -lstdc++ -lstdc++fs -pthread -Wl,-Bdynamic

src/Makevars.ucrt

@@ -32,8 +32,8 @@ void load_later_safe(void *data) {
 }
 
 void exec_later(void *data) {
-  SEXP call, x = (SEXP) data;
-  PROTECT(call = Rf_lcons(data, R_NilValue));
+  SEXP call, fn = (SEXP) data;
+  PROTECT(call = Rf_lcons(fn, R_NilValue));
   Rf_eval(call, R_GlobalEnv);
   UNPROTECT(1);
 }