Cleanup Windows build

Author: jeroen

src/Makevars.ucrt

@@ -1,15 +1,14 @@
-CXX_STD = CXX11
 GCC_VERSION = ${subst gcc,,${COMPILED_BY}}
 RWINLIB = ../windows/zeromq-4.3.4
 
-PKG_CXXFLAGS = -Wno-deprecated-declarations
+#PKG_CXXFLAGS = -Wno-deprecated-declarations
 
 PKG_CPPFLAGS = -DZMQ_STATIC \
 	-I${RWINLIB}/include -I../inst
 
 PKG_LIBS = \
 	-L${RWINLIB}/lib${GCC_VERSION}${R_ARCH} \
-	-L${RWINLIB}/lib${R_ARCH}${CRT} \
+	-L${RWINLIB}/lib${R_ARCH} \
 	-lzmq -lsodium -liphlpapi -lws2_32
 
 all: clean winlibs

src/Makevars.win

@@ -1,8 +1,11 @@
 # Build against precompiled zeromq libs.
 if(!file.exists("../windows/zeromq-4.3.4/include/zmq.h")){
   if(getRversion() < "3.3.0") setInternet2()
-  download.file("https://github.com/rwinlib/zeromq/archive/v4.3.4.zip", "lib.zip", quiet = TRUE)
+  download.file("https://github.com/rwinlib/zeromq/archive/4.3.4.zip", "lib.zip", quiet = TRUE)
   dir.create("../windows", showWarnings = FALSE)
   unzip("lib.zip", exdir = "../windows")
   unlink("lib.zip")
+  
+  # We want to use vendored zmq.hpp from rzmq instead
+  unlink("../windows/zeromq-4.3.4/include/*.hpp")
 }