Windows: go back to gifski-devel

Author: jeroen

src/Makevars.win

@@ -1,12 +1,22 @@
-RWINLIB = ../windows/gifski-0.8.4
-PKG_CPPFLAGS= -I$(RWINLIB)/include
-PKG_LIBS= -L$(RWINLIB)/lib${R_ARCH} \
-	-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp
+TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
+LIBDIR = myrustlib/target/$(TARGET)/release
+STATLIB = $(LIBDIR)/myrustlib.lib
+PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp
 
-all: clean winlibs
+# These can also be set in ~/.cargo/config
+export CARGO_TARGET_I686_PC_WINDOWS_GNU_LINKER=$(CC)
+export CC=$(CC)
+export AR=$(AR)
 
-winlibs:
-	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
+# This bypasses the exception stuff
+#export CARGO_TARGET_I686_PC_WINDOWS_GNU_RUSTFLAGS=-C panic=abort
+
+all: clean
+
+$(SHLIB): $(STATLIB)
+
+$(STATLIB):
+	cargo build --target=$(TARGET) --release --manifest-path=myrustlib/Cargo.toml
 
 clean:
-	rm -f $(SHLIB) $(OBJECTS)
+	rm -Rf $(SHLIB) $(STATLIB) $(OBJECTS) myrustlib/target

src/Makevars.win.rust

@@ -0,0 +1,12 @@
+RWINLIB = ../windows/gifski-0.8.4
+PKG_CPPFLAGS= -I$(RWINLIB)/include
+PKG_LIBS= -L$(RWINLIB)/lib${R_ARCH} \
+	-lgifski -lws2_32 -ladvapi32 -luserenv -ldbghelp
+
+all: clean winlibs
+
+winlibs:
+	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
+
+clean:
+	rm -f $(SHLIB) $(OBJECTS)