build libgifski from source if cargo is available

Author: jeroen

NEWS

@@ -1,3 +1,6 @@
+1.7.0
+  - Windows R >= 4.2: build libgifski from source if cargo is available
+
 1.6.6-1
   - Fix for legacy Windows Vista/2008 (for the old winbuilder)
 

configure.win renamed to configure.ucrt

@@ -9,6 +9,6 @@ if [ $? -eq 0 ]; then
   echo "$VERSION"
 else
   echo "Cargo not found. Falling back to static libraries"
-  cp -f src/Makevars.win.static src/Makevars.win
+  rm -f Makevars.ucrt
 fi
 exit 0

src/Makevars.ucrt

@@ -0,0 +1,28 @@
+TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
+LIBDIR = myrustlib/target/$(TARGET)/release
+STATLIB = $(LIBDIR)/libmyrustlib.a
+PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
+
+ifeq ($(R_COMPILED_BY),gcc 8.3.0)
+GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/mingw$(WIN)/bin
+else
+# Either rtools40 or rtools42 ucrt toolchain is OK
+GCCPATH=$(R_RTOOLS42_PATH):$(subst C:\,/c/,$(RTOOLS40_HOME))/ucrt64/bin
+export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=gcc
+endif
+
+all: clean rustup
+
+$(SHLIB): $(STATLIB)
+
+$(STATLIB):
+ifeq ($(WIN),64) #hack for missing libgcc_eh in mxe-rtools42
+	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
+
+clean:
+	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target
+
+rustup:
+	rustup target add $(TARGET) || true

src/Makevars.win

@@ -1,28 +1,13 @@
-TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
-LIBDIR = myrustlib/target/$(TARGET)/release
-STATLIB = $(LIBDIR)/libmyrustlib.a
-PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
+VERSION = 1.6.6
+RWINLIB = ../windows/gifski-winlibs
+PKG_CPPFLAGS = -I$(RWINLIB)/include
+PKG_LIBS = -L$(RWINLIB)/lib${R_ARCH}${CRT} \
+	-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt
 
-ifeq ($(R_COMPILED_BY),gcc 8.3.0)
-GCCPATH=$(subst C:\,/c/,$(RTOOLS40_HOME))/mingw$(WIN)/bin
-else
-# Either rtools40 or rtools42 ucrt toolchain is OK
-GCCPATH=$(R_RTOOLS42_PATH):$(subst C:\,/c/,$(RTOOLS40_HOME))/ucrt64/bin
-export CARGO_TARGET_X86_64_PC_WINDOWS_GNU_LINKER=gcc
-endif
+all: clean winlibs
 
-all: clean rustup
-
-$(SHLIB): $(STATLIB)
-
-$(STATLIB):
-ifeq ($(WIN),64) #hack for missing libgcc_eh in mxe-rtools42
-	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
+winlibs:
+	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R" $(VERSION)
 
 clean:
-	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target
-
-rustup:
-	rustup target add $(TARGET) || true
+	rm -f $(SHLIB) $(OBJECTS)