feat: Allows for extenal use of library crate

ixpantia · Jul 5, 2024 · 9af0016 · 9af0016
1 parent ed70a76
commit 9af0016
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/Makevars b/src/Makevars
@@ -1,7 +1,7 @@
 TARGET_DIR = ./rust/target
 LIBDIR = $(TARGET_DIR)/release
 STATLIB = $(LIBDIR)/liborbweaver.a
-PKG_LIBS = -L$(LIBDIR) -lorbweaver
+PKG_LIBS = -L$(LIBDIR) -lorbweaver_r
 
 all: C_clean
 

diff --git a/src/Makevars.win b/src/Makevars.win
@@ -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)/liborbweaver.a
-PKG_LIBS = -L$(LIBDIR) -lorbweaver -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll
+PKG_LIBS = -L$(LIBDIR) -lorbweaver_r -lws2_32 -ladvapi32 -luserenv -lbcrypt -lntdll
 
 all: C_clean
 

diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml
@@ -4,11 +4,11 @@ version = '0.13.0'
 edition = '2021'
 
 [lib]
-crate-type = [ 'staticlib' ]
-name = 'orbweaver'
+crate-type = [ 'staticlib', 'lib' ]
+name = 'orbweaver_r'
 
 [dependencies]
- extendr-api = { version = "0.7", features = ["serde"] }
+extendr-api = { version = "0.7", features = ["serde"] }
 orbweaver = { version = "0.13.0" }
 #orbweaver = { git = "https://github.com/ixpantia/orbweaver-rs.git", branch = "main" }