diff options
| author | Ken Kellner <ken@kenkellner.com> | 2020-12-20 14:49:06 -0500 |
|---|---|---|
| committer | Ken Kellner <ken@kenkellner.com> | 2020-12-20 14:49:06 -0500 |
| commit | c4d86b45eba11f03a080327af0b822f80eec9d8f (patch) | |
| tree | 15a8bf91510bb3ae4829eaa9ed69dea4b15b9a7e /src | |
| parent | ce5e143773c461a2653ded017b1db432ca745ab4 (diff) | |
Bump version and fix Makevars
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makevars | 2 | ||||
| -rw-r--r-- | src/Makevars.win | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Makevars b/src/Makevars index bd35875..34c6f02 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1,4 +1,4 @@ ## Use the R_HOME indirection to support installations of multiple R version -PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) +PKG_LIBS = $(shell $(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()" ) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CXXFLAGS) PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) diff --git a/src/Makevars.win b/src/Makevars.win index ff766b9..204b0c4 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,6 +1,6 @@ ## Use the R_HOME indirection to support installations of multiple R version -PKG_LIBS = $(shell "$(R_HOME)/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) +PKG_LIBS = $(shell "$(R_HOME)/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()") $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) $(SHLIB_OPENMP_CXXFLAGS) ##PKG_LIBS+= $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) ##PKG_LIBS+= -lRcpp ##PKG_LIBS+= -LC:/PROGRA~1/R/R-3.0.0/library/Rcpp/libs${R_ARCH_BIN} |