Update Makevars.ucrt

rstudio · Jan 26, 2024 · 83dc8fc · 83dc8fc
1 parent 4a9fd06
commit 83dc8fc
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # httpuv (development version)
 
+# httpuv 1.6.13.9000
+
+* Updated Makevars.ucrt for upcoming release of Rtools (thanks to Tomas Kalibera).
+
 # httpuv 1.6.13
 
 * Closed #388: Fix R CMD check warning re error() format strings (for r-devel). (#389)

diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
@@ -1,5 +1,12 @@
-PKG_LIBS = ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o \
-	-luv -lpthread -lws2_32 -lkernel32 -lpsapi -liphlpapi -lshell32 -luserenv -lz
+PKG_LIBS = ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o
+
+ifeq (,$(shell pkg-config --version 2>/dev/null))
+   PKG_LIBS += \
+	-luv -lpthread -lws2_32 -lkernel32 -lpsapi -liphlpapi -lshell32 -luserenv -lz \
+        -ldbghelp -luuid -lole32
+else
+   PKG_LIBS += $(shell pkg-config --libs zlib libuv)
+endif
 
 PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS
 PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS