Skip to content

Commit

Permalink
try these linker chnages?
Browse files Browse the repository at this point in the history
  • Loading branch information
JosiahParry committed Nov 27, 2024
1 parent 9f9da7b commit e49a283
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
^\.Rproj\.user$
^data-raw$
^src/\.cargo$
^src/rust/target$
^LICENSE\.md$
^dev$
^README\.Rmd$
Expand Down
2 changes: 1 addition & 1 deletion src/Makevars.in
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
TARGET_DIR = ./rust/target
LIBDIR = $(TARGET_DIR)/release
STATLIB = $(LIBDIR)/libarcgisplaces.a
PKG_LIBS = -L$(LIBDIR) -larcgisplaces -lssl -lcrypto
PKG_LIBS = -L$(LIBDIR) -larcgisplaces -lcrypto

all: C_clean

Expand Down
2 changes: 1 addition & 1 deletion src/Makevars.win.in
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ TARGET = $(subst 64,x86_64,$(subst 32,i686,$(WIN)))-pc-windows-gnu
TARGET_DIR = ./rust/target
LIBDIR = $(TARGET_DIR)/$(TARGET)/release
STATLIB = $(LIBDIR)/libarcgisplaces.a
PKG_LIBS = -L$(LIBDIR) -larcgisplaces -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll -lcrypt32 -lssl -lcrypto -lsecur32
PKG_LIBS = -L$(LIBDIR) -larcgisplaces -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll -lcrypt32 -lcrypto -lsecur32 -lmingw32

all: C_clean

Expand Down

0 comments on commit e49a283

Please sign in to comment.