Windows: update static gifski to 1.12.0

Author: jeroen

NEWS

@@ -1,3 +1,7 @@
+1.12.0
+  - Update embedded libgifski to upstream 1.12.0
+  - Windows: if rust is available, default to source build of libgifski.
+
 1.6.6-1
   - Fix for legacy Windows Vista/2008 (for the old winbuilder)
 

src/Makevars.win

@@ -4,31 +4,20 @@ STATLIB = $(LIBDIR)/libmyrustlib.a
 PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
 
 # These can also be set in ~/.cargo/config
-#export CARGO_TARGET_I686_PC_WINDOWS_GNU_LINKER=C:\\rtools40\\mingw$(WIN)\\bin\\gcc
-#export CC=$(CC)
-#export AR=$(AR)
-
-# This bypasses the exception stuff
-#export CARGO_TARGET_I686_PC_WINDOWS_GNU_RUSTFLAGS=-C panic=abort
 ifeq ($(R_COMPILED_BY),gcc 8.3.0)
 GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/mingw$(WIN)/bin
 export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=$(RTOOLS40_HOME)\\mingw64\\bin\\gcc
 export CARGO_TARGET_I686_PC_WINDOWS_GNU_LINKER=$(RTOOLS40_HOME)\\\mingw32\\bin\\gcc
 else
-export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=gcc
-ifdef RTOOLS40_HOME
-GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/ucrt64/bin
-else
 GCCPATH=$(subst C:\,/c/,$(RTOOLS43_HOME))/x86_64-w64-mingw32.static.posix/bin
 endif
-endif
 
 all: clean rustup
 
 $(SHLIB): $(STATLIB)
 
 $(STATLIB):
-ifeq ($(WIN),64) #hack for mxe-rtools42
+ifeq ($(WIN),64) #hack for mxe-rtools42 missing -lgcc_eh
 	mkdir -p myrustlib/target/release/deps; echo '!<arch>' > myrustlib/target/release/deps/libgcc_eh.a
 endif
 	PATH="$(GCCPATH):$(USERPROFILE)\.cargo:$(PATH)" cargo build --target=$(TARGET) --release --manifest-path=myrustlib/Cargo.toml

src/Makevars.win.static

@@ -1,7 +1,9 @@
-VERSION = 1.6.6
+VERSION = 1.12.0
 RWINLIB = ../windows/gifski-winlibs
 PKG_CPPFLAGS = -I$(RWINLIB)/include
-PKG_LIBS = -L$(RWINLIB)/lib${R_ARCH}${CRT} \
+GCC_VERSION = ${subst gcc,,${COMPILED_BY}}
+PKG_LIBS = -L$(RWINLIB)/lib$(GCC_VERSION)$(R_ARCH) \
+	-L$(RWINLIB)/lib$(R_ARCH) \
 	-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
 
 all: clean winlibs