[Rcpp-commits] r196 - in pkg: inst man

[noreply at r-forge.r-project.org]

Author: edd
Date: 2009-12-18 03:09:45 +0100 (Fri, 18 Dec 2009)
New Revision: 196

Modified:
   pkg/inst/ChangeLog
   pkg/man/RcppInline.Rd
Log:
updated help page in line with function changes from previous commit


Modified: pkg/inst/ChangeLog
===================================================================
--- pkg/inst/ChangeLog	2009-12-18 00:59:27 UTC (rev 195)
+++ pkg/inst/ChangeLog	2009-12-18 02:09:45 UTC (rev 196)
@@ -1,3 +1,11 @@
+2009-12-17  Dirk Eddelbuettel  <edd at debian.org>
+
+	* R/RcppInline.R: Improved / simplified in light of getting it to
+ 	  work on Windoze too so switched to setting env var explicitly;
+	  also split into three args for CPPFLAGS, CXXFLAGS and LIBS
+	* man/RcppInline.Rd: Updated accordingly to reflect new args
+        * inst/examples/RcppInline/RcppInlineWithLibsExamples.r: Idem
+
 2009-12-16  Dirk Eddelbuettel  <edd at debian.org>
 
 	* src/RcppSexp.{h,cpp}: Added simple RcppSexp class for simple

Modified: pkg/man/RcppInline.Rd
===================================================================
--- pkg/man/RcppInline.Rd	2009-12-18 00:59:27 UTC (rev 195)
+++ pkg/man/RcppInline.Rd	2009-12-18 02:09:45 UTC (rev 196)
@@ -20,7 +20,7 @@
             verbose=FALSE, 
             convention=c(".Call", ".C", ".Fortran"),
             Rcpp=FALSE,
-            compileargs=character(), linkargs=character())
+            cppargs=character(), cxxargs=character(), libargs=character())
 
   ## S4 methods for signatures
   #  f='character', sig='list', body='list'
@@ -77,16 +77,20 @@
   the R / C++ interface provided by the \code{Rcpp} package can be
   used. Default value is \code{FALSE}.}
 
-  \item{compileargs}{Optional character vector of tokens to be passed to
-  the compiler via the \code{PKG_CXXFLAGS} environment
+  \item{cppargs}{Optional character vector of tokens to be passed to
+  the compiler via the \code{PKG_CPPFLAGS} environment
   variable. Elements should be fully formed as for example
   \code{c("-I/usr/local/lib/foo", "-DDEBUG")} and are passed along verbatim.}
 
-  \item{linkargs}{Optional character vector of tokens to be passed to
+  \item{cxxargs}{Optional character vector of tokens to be passed to
   the compiler via the \code{PKG_CXXFLAGS} environment
   variable. Elements should be fully formed as for example
-  \code{c("-L/usr/local/lib/foo -lfoo", "--lpthread")} and are passed
-  along verbatim.}
+  \code{c("-I/usr/local/lib/foo", "-DDEBUG")} and are passed along verbatim.}
+
+  \item{libargs}{Optional character vector of tokens to be passed to the
+  compiler via the \code{PKG_LIBS} environment variable. Elements should
+  be fully formed as for example \code{c("-L/usr/local/lib/foo -lfoo",
+  "--lpthread")} and are passed along verbatim.}
     
   \item{...}{ Reserved.}
 }