Permalink
Browse files

Upgrade to latest Rcpp

  • Loading branch information...
1 parent 34188a0 commit 94f0334eddce5686eea26eabc5eef8a24b529855 @hadley committed Feb 20, 2014
Showing with 4 additions and 2 deletions.
  1. +2 −0 DESCRIPTION
  2. +1 −0 NAMESPACE
  3. +1 −0 R/plyr.r
  4. +0 −1 src/Makevars
  5. +0 −1 src/Makevars.win
View
@@ -16,6 +16,8 @@ Description: plyr is a set of tools that solves a common
URL: http://had.co.nz/plyr
Depends:
R (>= 2.11.0)
+Imports:
+ Rcpp (>= 0.11.0)
LinkingTo: Rcpp
Suggests:
abind,
View
@@ -106,5 +106,6 @@ export(try_default)
export(tryapply)
export(unrowname)
export(vaggregate)
+importFrom(Rcpp,sourceCpp)
importFrom(stats,setNames)
useDynLib(plyr)
View
@@ -60,6 +60,7 @@
#' }
#'
#' @docType package
+#' @importFrom Rcpp sourceCpp
#' @name plyr
NULL
View
@@ -1 +0,0 @@
-PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`
View
@@ -1 +0,0 @@
-PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")

0 comments on commit 94f0334

Please sign in to comment.