Update Makevars

lionel- · lionel- · commit e35acd74b707 · 2023-03-08T11:45:46.000+01:00
diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
@@ -1,8 +1,4 @@
 CXX_STD = CXX11
 
-PKG_LIBS = -lpng -lz
-
-all: clean
-
-clean:
-	rm -f $(OBJECTS)
+CRT = -ucrt
+include Makevars.win
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,9 +1,9 @@
 CXX_STD = CXX11
 
-RWINLIB = ../windows/harfbuzz-2.7.4
+VERSION = 2.7.4
+RWINLIB = ../windows/harfbuzz-${VERSION}
 
-PKG_CPPFLAGS = -I${RWINLIB}/include \
-	-DSTRICT_R_HEADERS
+PKG_CPPFLAGS = -I${RWINLIB}/include
 
 PKG_LIBS = -L${RWINLIB}/lib${R_ARCH}${CRT} -lpng -lz
 
diff --git a/tools/winlibs.R b/tools/winlibs.R
@@ -1,4 +1,4 @@
-VERSION <- "2.7.4"
+VERSION <- commandArgs(TRUE)
 if(!file.exists(sprintf("../windows/harfbuzz-%s/include/png.h", VERSION))){
   if(getRversion() < "3.3.0") setInternet2()
   download.file(sprintf("https://github.com/rwinlib/harfbuzz/archive/v%s.zip", VERSION), "lib.zip", quiet = TRUE)

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-VERSION <- "2.7.4"`
	`1`	`+VERSION <- commandArgs(TRUE)`
`2`	`2`	`if(!file.exists(sprintf("../windows/harfbuzz-%s/include/png.h", VERSION))){`
`3`	`3`	`if(getRversion() < "3.3.0") setInternet2()`
`4`	`4`	`download.file(sprintf("https://github.com/rwinlib/harfbuzz/archive/v%s.zip", VERSION), "lib.zip", quiet = TRUE)`