[Rcpp-commits] r970 - pkg/RcppArmadillo/src

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

Author: edd
Date: 2010-04-04 02:52:07 +0200 (Sun, 04 Apr 2010)
New Revision: 970

Modified:
   pkg/RcppArmadillo/src/Makevars.win
Log:
small tweaks to make RcppArmadillo build on Windows


Modified: pkg/RcppArmadillo/src/Makevars.win
===================================================================
--- pkg/RcppArmadillo/src/Makevars.win	2010-04-03 23:43:01 UTC (rev 969)
+++ pkg/RcppArmadillo/src/Makevars.win	2010-04-04 00:52:07 UTC (rev 970)
@@ -1,8 +1,9 @@
 ## This assumes that we can call Rscript to ask Rcpp about its locations
 ## Use the R_HOME indirection to support installations of multiple R version
-PKG_LIBS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()'`
-PKG_CPPFLAGS = `$(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::CxxFlags()'`
+PKG_LIBS = $(shell $(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::LdFlags()')
+PKG_CPPFLAGS = $(shell $(R_HOME)/bin/Rscript --vanilla -e 'Rcpp:::CxxFlags()')
 
 INCLUDE_DIR=../inst/include
-PKG_CPPFLAGS += $(INCLUDE_DIR)
+PKG_CPPFLAGS += -I$(INCLUDE_DIR) -I.
 
+PKG_LIBS += $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)