Skip to content

Commit 827c3b9

Browse files
committed
mention RStudio page in FAQ 1.2, minor edit to README
1 parent 9055167 commit 827c3b9

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,23 @@ see 'citation("Rcpp")' for details.
5757

5858
## Installation
5959

60-
To install Rcpp from github, first make sure you have a [package development environment](http://www.rstudio.com/ide/docs/packages/prerequisites), and then:
60+
Released and tested versions of Rcpp available via the
61+
[CRAN](http://cran.r-project.org) network, and be installed from within R via
6162

6263
```R
63-
install.packages("devtools")
64-
devtools::install_github("RcppCore/Rcpp")
64+
install.packages( "Rcpp" )
6565
```
6666

67-
Rcpp is also available from CRAN.
67+
To install Rcpp snapshots directly from the master branch at GitHub, first
68+
ensure you have a [package development environment](http://www.rstudio.com/ide/docs/packages/prerequisites), and
69+
then:
6870

6971
```R
70-
install.packages( "Rcpp" )
72+
install.packages("devtools")
73+
devtools::install_github("RcppCore/Rcpp")
7174
```
7275

73-
On OSX 10.9 (Mavericks) with Xcode 5.0 it is recommended to install Rcpp from source after
76+
On OS X 10.9 (Mavericks) with Xcode 5.0 it is recommended to install Rcpp from source after
7477
setting these variables in `~/.R/Makevars`
7578

7679
```
@@ -79,3 +82,4 @@ CXX=clang++
7982
CXXFLAGS= -O3
8083
```
8184

85+
Also see questions 1.2 and 1.3 in the [Rcpp-FAQ]((http://cran.r-project.org/web/packages/Rcpp/vignettes/Rcpp-FAQ.pdf).

vignettes/Rcpp-FAQ.Rnw

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@ means one needs:
110110
\item standard development tools such as \texttt{make} etc.
111111
\end{itemize}
112112

113+
Also see the \href{http://www.rstudio.com/ide/docs/packages/prerequisites}{RStudio
114+
documentation} on pre-requisites for R package development.
113115

114116
\subsection{What compiler can I use ?}
115117

0 commit comments

Comments
 (0)