Merge pull request #92 from jeroen/master

Windows: build against nlopt 2.7.1
astamm · Jan 17, 2022 · 397e765 · 397e765
2 parents a74c5ba + 7f30707
commit 397e765
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 37 deletions.
diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml
@@ -20,6 +20,7 @@ jobs:
         config:
           - {os: macOS-latest,   r: 'release'}
           - {os: windows-latest, r: 'release'}
+          - {os: windows-2022,   r: 'devel'}
           - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
           - {os: ubuntu-latest,   r: 'release'}
           - {os: ubuntu-latest,   r: 'oldrel-1'}

diff --git a/configure.win b/configure.win
diff --git a/src/Makevars.ucrt b/src/Makevars.ucrt
@@ -0,0 +1,2 @@
+CRT=-ucrt
+include Makevars.win
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,3 +1,13 @@
 CXX_STD = CXX11
-PKG_CPPFLAGS = -I../inst/include
-PKG_LIBS = $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) -Lnlopt$(R_ARCH)/lib -lnlopt
+VERSION = 2.7.1
+WINLIBS = ../windows/nlopt-2.7.1
+PKG_CPPFLAGS = -I../inst/include -I$(WINLIBS)/include
+PKG_LIBS = -L$(WINLIBS)/lib${R_ARCH}${CRT} -lnlopt
+
+all: clean winlibs
+
+winlibs:
+	"${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" "../tools/winlibs.R"
+
+clean:
+	rm -f $(SHLIB) $(OBJECTS)
diff --git a/tools/winlibs.R b/tools/winlibs.R
@@ -0,0 +1,7 @@
+# Build against mingw-w64 build of nlopt
+if(!file.exists("../windows/nlopt-2.7.1/include/nlopt.hpp")){
+    download.file("https://github.com/rwinlib/nlopt/archive/v2.7.1.zip", "lib.zip", quiet = TRUE)
+    dir.create("../windows", showWarnings = FALSE)
+    unzip("lib.zip", exdir = "../windows")
+    unlink("lib.zip")
+}