diff --git a/src/R/DESCRIPTION b/src/R/DESCRIPTION index b7c22a1..a8cdf56 100644 --- a/src/R/DESCRIPTION +++ b/src/R/DESCRIPTION @@ -1,8 +1,7 @@ Package: Rsomoclu -Version: 1.7.5.2 -Date: 2018-11-29 +Version: 1.7.5.3 +Date: 2019-01-03 Title: Somoclu -Depends: Rcpp Imports: kohonen Suggests: Authors@R: c(person(given = "Peter", family = "Wittek", role = c("aut"), email = ""), diff --git a/src/R/NAMESPACE b/src/R/NAMESPACE index 878b339..3346df6 100644 --- a/src/R/NAMESPACE +++ b/src/R/NAMESPACE @@ -1,6 +1,5 @@ useDynLib(Rsomoclu, .registration = TRUE) export(Rsomoclu.train) export(Rsomoclu.kohonen) -import(Rcpp) import(kohonen) importFrom(kohonen, somgrid) diff --git a/src/R/src/Makevars b/src/R/src/Makevars index 1e392e2..e24ad67 100644 --- a/src/R/src/Makevars +++ b/src/R/src/Makevars @@ -1,3 +1,3 @@ CXX_STD = CXX11 -PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(SHLIB_OPENMP_CXXFLAGS) -PKG_CXXFLAGS = `$(R_HOME)/bin/Rscript -e "Rcpp:::CxxFlags()"` $(SHLIB_OPENMP_CXXFLAGS) -DHAVE_R +PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) +PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DHAVE_R diff --git a/src/R/src/Makevars.win b/src/R/src/Makevars.win index 1e392e2..e24ad67 100644 --- a/src/R/src/Makevars.win +++ b/src/R/src/Makevars.win @@ -1,3 +1,3 @@ CXX_STD = CXX11 -PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"` $(SHLIB_OPENMP_CXXFLAGS) -PKG_CXXFLAGS = `$(R_HOME)/bin/Rscript -e "Rcpp:::CxxFlags()"` $(SHLIB_OPENMP_CXXFLAGS) -DHAVE_R +PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) +PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS) -DHAVE_R