Skip to content

Commit

Permalink
Windows: add -lntdll linker flag required by Rust 1.70
Browse files Browse the repository at this point in the history
  • Loading branch information
jeroen committed Jun 8, 2023
1 parent ce1a0f3 commit 850797a
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: gifski
Type: Package
Title: Highest Quality GIF Encoder
Version: 1.12.0
Version: 1.12.0-1
Authors@R: c(
person("Jeroen", "Ooms", ,"[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-4035-0289")),
Expand Down
3 changes: 3 additions & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
1.12.0-1
- Windows: add -lntdll linker flag required by Rust 1.70

1.12.0
- Update embedded libgifski to upstream 1.12.0
- Windows: if Cargo is available, default to source build of libgifski
Expand Down
2 changes: 1 addition & 1 deletion src/Makevars.win.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
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
PKG_LIBS = -L$(LIBDIR) -lmyrustlib -lws2_32 -ladvapi32 -luserenv -ldbghelp -lbcrypt -lntdll

# These can also be set in ~/.cargo/config
ifeq ($(R_COMPILED_BY),gcc 8.3.0)
Expand Down

0 comments on commit 850797a

Please sign in to comment.