[Rcpp-commits] r984 - pkg/RcppGsl/src

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

Author: edd
Date: 2010-04-05 13:41:02 +0200 (Mon, 05 Apr 2010)
New Revision: 984

Modified:
   pkg/RcppGsl/src/Makevars.win
Log:
use LIB_GSL to point to Uwe's GSL installation


Modified: pkg/RcppGsl/src/Makevars.win
===================================================================
--- pkg/RcppGsl/src/Makevars.win	2010-04-04 18:18:15 UTC (rev 983)
+++ pkg/RcppGsl/src/Makevars.win	2010-04-05 11:41:02 UTC (rev 984)
@@ -1,5 +1,7 @@
-## This assume that we can call Rscript to ask Rcpp about its locations
-## Use the R_HOME indirection to support installations of multiple R version
-PKG_CPPFLAGS=$(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::CxxFlags()" ) -I../inst/include
-PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e "Rcpp:::LdFlags()" )
 
+## This assumes that the LIB_GSL variable points to working GSL libraries
+## It also assume that we can call Rscript to ask Rcpp about its locations
+PKG_CPPFLAGS=-I$(LIB_GSL)/include $(shell Rscript.exe -e "Rcpp:::CxxFlags()")
+PKG_LIBS=-L$(LIB_GSL)/lib -lgsl -lgslcblas $(shell Rscript.exe -e "Rcpp:::LdFlags()")
+
+