Skip to content

Commit 1ddab4c

Browse files
committed
Update Windows static binaries
1 parent 524be1a commit 1ddab4c

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

src/Makevars.win

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
RWINLIB = ../windows/gifski-0.8.7
1+
VERSION=1.4.3
2+
RWINLIB = ../windows/gifski-$(VERSION)
23
PKG_CPPFLAGS= -I$(RWINLIB)/include
34
PKG_LIBS= -L$(RWINLIB)/lib${R_ARCH} \
45
-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp
56

67
all: clean winlibs
78

89
winlibs:
9-
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
10+
"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" $(VERSION)
1011

1112
clean:
1213
rm -f $(SHLIB) $(OBJECTS)

src/wrapper.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ SEXP R_png_to_gif(SEXP png_files, SEXP gif_file, SEXP width, SEXP height, SEXP d
3737
if(gifski_add_frame_png_file(g, i, CHAR(STRING_ELT(png_files, i)), pts) != GIFSKI_OK)
3838
REprintf("Failed to add frame %d\n", i);
3939
if(Rf_asLogical(progress))
40-
REprintf("\rQueuing frame %d at %.2fs (%d%%)...", (i+1), pts, (i+1) * 100 / Rf_length(png_files));
40+
REprintf("\rInserting image %d at %.2fs (%d%%)...", (i+1), pts, (i+1) * 100 / Rf_length(png_files));
4141
}
4242

4343
/* This will finalize the encoder thread as well */

tools/winlibs.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# Build against gifski libs compiled with the Rtools
2-
if(!file.exists("../windows/gifski-0.8.7/include/gifski.h")){
2+
VERSION <- commandArgs(TRUE)
3+
if(!file.exists(sprintf("../windows/gifski-%s/include/gifski.h", VERSION))){
34
if(getRversion() < "3.3.0") setInternet2()
4-
download.file("https://github.com/rwinlib/gifski/archive/v0.8.7.zip", "lib.zip", quiet = TRUE)
5+
download.file(sprintf("https://github.com/rwinlib/gifski/archive/v%s.zip", VERSION), "lib.zip", quiet = TRUE)
56
dir.create("../windows", showWarnings = FALSE)
67
unzip("lib.zip", exdir = "../windows")
78
unlink("lib.zip")

0 commit comments

Comments
 (0)