[Rcpp-commits] r1853 - pkg/Rcpp/src

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

Author: romain
Date: 2010-07-13 13:20:22 +0200 (Tue, 13 Jul 2010)
New Revision: 1853

Modified:
   pkg/Rcpp/src/Makevars
   pkg/Rcpp/src/Makevars.win
Log:
no more  in Rcpp Makevars(,.win)

Modified: pkg/Rcpp/src/Makevars
===================================================================
--- pkg/Rcpp/src/Makevars	2010-07-10 12:18:30 UTC (rev 1852)
+++ pkg/Rcpp/src/Makevars	2010-07-13 11:20:22 UTC (rev 1853)
@@ -1,6 +1,6 @@
 # -*- mode: Makefile; tab-width: 8 -*- 
 #
-# Makefile for Rcpp 
+# Makevars for Rcpp 
 #
 # Copyright (C) 2008 - 2009 Dirk Eddelbuettel <edd at debian.org>
 # Copyright (C) 2008        Simon Urbanek <simon.urbanek at r-project.org>
@@ -10,13 +10,10 @@
 ## files in this directory. userLibrary is an additional target for the second library
 ## that will be installed in ../inst/lib$(R_ARCH) and which users can link against.
 
-## C++0x enabled if 
-## - the environment variable RCPP_CXX0X is set to yes
-## - it makes sense (GCC >= 4.3)
-ifeq ($(RCPP_CXX0X),yes)
-CLINK_CPPFLAGS = $(shell $(R_HOME)/bin/Rscript "cxx0x/cxx0x.R")
-endif
+## uncomment this to enable c++0x features (experimental)
+## CLINK_CPPFLAGS=-std=c++0x
 
+## guarding against a bug in how 'R CMD check' checks for portable flags
 ifeq ($(SHLIB),)
 all:
 else

Modified: pkg/Rcpp/src/Makevars.win
===================================================================
--- pkg/Rcpp/src/Makevars.win	2010-07-10 12:18:30 UTC (rev 1852)
+++ pkg/Rcpp/src/Makevars.win	2010-07-13 11:20:22 UTC (rev 1853)
@@ -17,12 +17,8 @@
 STATICLIB =	libRcpp.a
 USERLIB	= 	$(USERDIR)/$(STATICLIB)
 
-## C++0X support enabled if 
-## - the RCPP_CXX0X environment variable is set to "yes"
-## - it is possible (GCC>=4.3)
-ifeq ($(RCPP_CXX0X),yes)
-CLINK_CPPFLAGS := $shell("${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" cxx0x/cxx0x.R)
-endif
+## uncomment this to enable c++0x features (experimental)
+## CLINK_CPPFLAGS=-std=c++0x
 
 ## the 'package' library contains both Rcpp.{cpp,h} and the RcppExample used to demonstrate the package
 ## it is loaded via library(Rcpp) but is not used for compiling / linking against