Makevars and Makevars.win

prdm0 · Apr 24, 2024 · 4e783f8 · 4e783f8
1 parent 79787b2
commit 4e783f8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/src/AcceptReject.cpp b/src/AcceptReject.cpp
@@ -42,7 +42,6 @@ arma::vec one_step(int n, Function f, Function f_base, Function random_base, dou
         num_accepted = space_left;
         accepted = accepted.subvec(0, space_left - 1);
       }
-
       x.subvec(filled, filled + num_accepted - 1) = x_cand.elem(accepted);
       filled += num_accepted;
     }

diff --git a/src/Makevars b/src/Makevars
@@ -0,0 +1,7 @@
+## _In general_ we should no longer need to set a standard as any recent R
+## installation will do the right thing. Should you need it, uncomment it and
+## set the appropriate value, possibly CXX17.
+#CXX_STD = CXX11
+
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -0,0 +1,7 @@
+## _In general_ we should no longer need to set a standard as any recent R
+## installation will do the right thing. Should you need it, uncomment it and
+## set the appropriate value, possibly CXX17.
+#CXX_STD = CXX11
+
+PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
+PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)