fix #4, fix #34

dirkschumacher · Mar 5, 2021 · 5845eee · 5845eee
1 parent 2e0b50d
commit 5845eee
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -10,6 +10,7 @@ Authors@R: c(
 License: GPL-3 + file LICENSE
 NeedsCompilation: yes
 SystemRequirements: CBC libraries and headers
+Biarch: true
 Encoding: UTF-8
 LazyData: true
 LinkingTo: Rcpp

diff --git a/configure.win b/configure.win
@@ -0,0 +1,2 @@
+# No configuration needed on Windows
+# (this suppresses an unnecessary warning message during installation)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,5 +1,9 @@
+VERSION = 4.9.3
+RWINLIB = ../windows/cbc-2.9.8/lib-$(VERSION)$(R_ARCH)
+
 PKG_CPPFLAGS = -I../windows/cbc-2.9.8/include/coin
-PKG_LIBS = -L../windows/cbc-2.9.8/lib${subst gcc,,${COMPILED_BY}}${R_ARCH} \
+
+PKG_LIBS = -L$(RWINLIB) \
 	-lCbcSolver -lClpSolver \
 	-lOsiCbc -lCbc -lCgl -lOsiClp -lClp -lOsi -lCoinUtils -lz -lm
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# No configuration needed on Windows
		# (this suppresses an unnecessary warning message during installation)