[Rcpp-commits] r1000 - pkg/Rcpp/R

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

Author: edd
Date: 2010-04-06 02:59:46 +0200 (Tue, 06 Apr 2010)
New Revision: 1000

Modified:
   pkg/Rcpp/R/RcppLdpath.R
Log:
comment-out use of shQuote() which seems to upset "backticks" use in Makevars on Windows


Modified: pkg/Rcpp/R/RcppLdpath.R
===================================================================
--- pkg/Rcpp/R/RcppLdpath.R	2010-04-06 00:50:42 UTC (rev 999)
+++ pkg/Rcpp/R/RcppLdpath.R	2010-04-06 00:59:46 UTC (rev 1000)
@@ -21,9 +21,9 @@
     rcppdir <- RcppLdPath()
     if (static) {                               # static is default on Windows and OS X
         flags <- paste(rcppdir, "/libRcpp.a", sep="")
-        if (.Platform$OS.type=="windows") {
-            flags <- shQuote(flags)
-        }
+        #if (.Platform$OS.type=="windows") {
+        #    flags <- shQuote(flags)
+        #}
     } else {					# else for dynamic linking
         flags <- paste("-L", rcppdir, " -lRcpp", sep="") # baseline setting
         if ((.Platform$OS.type == "unix") &&    # on Linux, we can use rpath to encode path
@@ -41,9 +41,9 @@
 RcppCxxFlags <- function(cxx0x=FALSE) {
     # path <- RcppLdPath()
     path <- system.file( "include", package = "Rcpp" )
-    if (.Platform$OS.type=="windows") {
-        path <- shQuote(path)
-    }
+    #if (.Platform$OS.type=="windows") {
+    #    path <- shQuote(path)
+    #}
     paste("-I", path, if( cxx0x && canUseCXX0X() ) " -std=c++0x" else "", sep="")
 }