diff --git a/DESCRIPTION b/DESCRIPTION index 88a20af..fd8aed5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: detrendr Title: Detrend Images -Version: 0.6.15 +Version: 0.6.16 Authors@R: c( person("Rory", "Nolan", , "rorynoolan@gmail.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-5239-4043")), diff --git a/src/Makevars b/src/Makevars index 10829ad..7a518c8 100644 --- a/src/Makevars +++ b/src/Makevars @@ -1 +1,2 @@ PKG_LIBS += $(shell ${R_HOME}/bin/Rscript -e "RcppParallel::RcppParallelLibs()") +PKG_CXXFLAGS += $(shell ${R_HOME}/bin/Rscript -e "RcppParallel::CxxFlags()") diff --git a/src/Makevars.win b/src/Makevars.win index 0864658..d4000c5 100644 --- a/src/Makevars.win +++ b/src/Makevars.win @@ -1,4 +1,5 @@ PKG_CXXFLAGS += -DRCPP_PARALLEL_USE_TBB=1 +PKG_CXXFLAGS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "RcppParallel::CxxFlags()") PKG_LIBS += $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" \ -e "RcppParallel::RcppParallelLibs()")