[Earthmovdist-commits] r20 - pkg/src

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

Author: edd
Date: 2009-04-24 16:14:30 +0200 (Fri, 24 Apr 2009)
New Revision: 20

Added:
   pkg/src/Makevars.win
Modified:
   pkg/src/Makevars
Log:
added Makevars.win, minor edit in Makevars to make it similar

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2009-04-20 07:46:08 UTC (rev 19)
+++ pkg/src/Makevars	2009-04-24 14:14:30 UTC (rev 20)
@@ -1,6 +1,3 @@
-
-# compile flag providing Rcpp header
-PKG_CXXFLAGS=`Rscript -e 'Rcpp:::CxxFlags()'`
-
-# link flag providing Rcpp libary as well as path to library
-PKG_LIBS=`Rscript -e 'Rcpp:::LdFlags()'`
+# We need to know where libRcpp.so and Rcpp.h reside
+PKG_CPPFLAGS = $(shell Rscript -e 'Rcpp:::CxxFlags()')
+PKG_LIBS = $(shell Rscript -e 'Rcpp:::LdFlags()')

Added: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	                        (rev 0)
+++ pkg/src/Makevars.win	2009-04-24 14:14:30 UTC (rev 20)
@@ -0,0 +1,3 @@
+# We need to know where libRcpp.so and Rcpp.h reside
+PKG_CPPFLAGS = $(shell Rscript.exe -e 'Rcpp:::CxxFlags()')
+PKG_LIBS = $(shell Rscript.exe -e 'Rcpp:::LdFlags()')