[Rcpp-commits] r2806 - in pkg/Rcpp: . R

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

Author: edd
Date: 2010-12-20 17:19:13 +0100 (Mon, 20 Dec 2010)
New Revision: 2806

Modified:
   pkg/Rcpp/ChangeLog
   pkg/Rcpp/R/inline.R
Log:
PKG_LIBS needs 'libs' before Rcpp:::RcppLdFlags() for linking to succeed on Windows


Modified: pkg/Rcpp/ChangeLog
===================================================================
--- pkg/Rcpp/ChangeLog	2010-12-20 00:44:18 UTC (rev 2805)
+++ pkg/Rcpp/ChangeLog	2010-12-20 16:19:13 UTC (rev 2806)
@@ -1,3 +1,7 @@
+2010-12-20  Dirk Eddelbuettel  <edd at debian.org>
+
+	* R/inline.R (Rcpp.plugin.maker): Reverse order in PKG_LIBS 
+
 2010-12-19  Dirk Eddelbuettel  <edd at debian.org>
 
  	* DESCRIPTION: Release 0.9.0

Modified: pkg/Rcpp/R/inline.R
===================================================================
--- pkg/Rcpp/R/inline.R	2010-12-20 00:44:18 UTC (rev 2805)
+++ pkg/Rcpp/R/inline.R	2010-12-20 16:19:13 UTC (rev 2806)
@@ -1,4 +1,4 @@
-# Copyright (C) 2009- 2010	Dirk Eddelbuettel and Romain Francois
+# Copyright (C) 2009 - 2010	Dirk Eddelbuettel and Romain Francois
 #
 # This file is part of Rcpp.
 #
@@ -15,14 +15,14 @@
 # You should have received a copy of the GNU General Public License
 # along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
-Rcpp.plugin.maker <- function( 
-	include.before = "", 
-	include.after = "", 
-	LinkingTo     = unique( c( package, "Rcpp" ) ), 
-	Depends       = unique( c( package, "Rcpp" ) ), 
-	libs          = "", 
-	Makevars      = readLines( system.file("skeleton", "Makevars"    , package = package ) ) , 
-	Makevars.win  = readLines( system.file("skeleton", "Makevars.win", package = package ) ), 
+Rcpp.plugin.maker <- function(
+	include.before = "",
+	include.after = "",
+	LinkingTo     = unique( c( package, "Rcpp" ) ),
+	Depends       = unique( c( package, "Rcpp" ) ),
+	libs          = "",
+	Makevars      = readLines( system.file("skeleton", "Makevars"    , package = package ) ) ,
+	Makevars.win  = readLines( system.file("skeleton", "Makevars.win", package = package ) ),
 	package       = "Rcpp"
 ){
 	function( ... ){
@@ -41,19 +41,19 @@
 using namespace Rcpp;
 ", include.before, include.after )
 
-	list( 
-		env = list( PKG_LIBS = paste( Rcpp:::RcppLdFlags(), libs ) ), 
-		includes = includes, 
-		LinkingTo = LinkingTo , 
+	list(
+		env = list( PKG_LIBS = paste( libs, Rcpp:::RcppLdFlags() ) ),
+		includes = includes,
+		LinkingTo = LinkingTo ,
 		body = function( x ){
-			sprintf( "BEGIN_RCPP\n%s\nEND_RCPP", x )	
-		}, 
-		Depends = Depends, 
-		Makevars = Makevars, 
+			sprintf( "BEGIN_RCPP\n%s\nEND_RCPP", x )
+		},
+		Depends = Depends,
+		Makevars = Makevars,
 		Makevars.win = Makevars.win
 	)
 }
 }
 
-inlineCxxPlugin <- Rcpp.plugin.maker() 
+inlineCxxPlugin <- Rcpp.plugin.maker()