[Phylobase-commits] r847 - pkg/src

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

Author: francois
Date: 2014-02-12 20:38:27 +0100 (Wed, 12 Feb 2014)
New Revision: 847

Modified:
   pkg/src/Makevars
   pkg/src/Makevars.win
Log:
changes to reflect new flags with using Rcpp 0.11.0

Modified: pkg/src/Makevars
===================================================================
--- pkg/src/Makevars	2014-02-12 18:45:24 UTC (rev 846)
+++ pkg/src/Makevars	2014-02-12 19:38:27 UTC (rev 847)
@@ -1,2 +1,2 @@
 PKG_CPPFLAGS=-I. -DHAVE_INTTYPES_H -DASSERTS_TO_EXCEPTIONS
-PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`
+#PKG_LIBS = `$(R_HOME)/bin/Rscript -e "Rcpp:::LdFlags()"`

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2014-02-12 18:45:24 UTC (rev 846)
+++ pkg/src/Makevars.win	2014-02-12 19:38:27 UTC (rev 847)
@@ -1,6 +1,6 @@
 ## PKG_LIBS = -s $(shell Rscript -e 'Rcpp:::LdFlags()') -L"$(RHOME)/bin" -lR --no-export-all-symbols --add-stdcall-alias
 PKG_CXXFLAGS =  -I. -DHAVE_INTTYPES_H -DASSERTS_TO_EXCEPTIONS
-PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
+## PKG_LIBS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")