[Rcpp-commits] r164 - pkg/src

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

Author: edd
Date: 2009-11-08 23:05:01 +0100 (Sun, 08 Nov 2009)
New Revision: 164

Modified:
   pkg/src/Makevars.win
Log:
fixes for 0.6.7 on Windows 
(this will go out as 0.6.7.1 once I get a chance to test it on Windows at work; it built fine on win-builder.r-project.org whereas 0.6.7 failed)


Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2009-11-08 18:10:12 UTC (rev 163)
+++ pkg/src/Makevars.win	2009-11-08 22:05:01 UTC (rev 164)
@@ -2,30 +2,32 @@
 #
 # Makefile.win for Rcpp
 #
-# Copyright (C) 2008    Dirk Eddelbuettel <edd at debian.org>
+# Copyright (C) 2008 - 2009 Dirk Eddelbuettel <edd at debian.org>
 #
 # Contributions from an older Makefile.win are
 # (C) Dominick Samperi and Uwe Ligges and gratefully acknowledged
 
-RCPPFLAGS	= `${R_HOME}/bin/R CMD config --cppflags`
-RLDFLAGS	= `${R_HOME}/bin/R CMD config --ldflags`
+#RCPPFLAGS	= `${R_HOME}/bin/R CMD config --cppflags`
+#RLDFLAGS	= `${R_HOME}/bin/R CMD config --ldflags`
+#CXXFLAGS 	= -I. $(RCPPFLAGS) -Wall -O2
 
-## the 'package' library contains both Rcpp.{cpp,h} and the RcppExample used to demonstrate the package
-## it is loaded via library(Rcpp) but is not used for compiling / linking against
-PKGLIB 		= Rcpp.dll
-PKGOBJ 		= RcppExample.o Rcpp.o
-PKGLDFLAGS 	= -s $(RLDFLAGS)
-
 ## the 'user' library contains only Rcpp.{cpp,h} and is what users need for their projects
 ## we place it inside the inst/ directory so that it gets installed 
 ## use 'Rscript -e 'cat(system.file("lib", "Rcpp.a", package="Rcpp", "\n")'  to get location
-USERDIR		= ../inst/lib
-USERLIB		= $(USERDIR)/libRcpp.a
-USEROBJ		= Rcpp.o
+USERDIR	= 	../inst/lib
+USERLIB	= 	$(USERDIR)/libRcpp.a
+USEROBJ	= 	Rcpp.o RcppList.o
 
-CXXFLAGS 	= -I. $(RCPPFLAGS) -Wall -O2
-RM 		= rm -f
+## the 'package' library contains both Rcpp.{cpp,h} and the RcppExample used to demonstrate the package
+## it is loaded via library(Rcpp) but is not used for compiling / linking against
+PKGLIB = 	Rcpp.dll
+PKGOBJ = 	RcppExample.o $(USEROBJ)
+PKGLDFLAGS = 	-s 
 
+PKG_CPPFLAGS += -I. -Wall -O2
+
+RM = 		rm -f
+
 .PHONY: 	all clean
 
 all: 		$(USERLIB) $(PKGLIB)
@@ -40,7 +42,7 @@
 		-mkdir -p $(USERDIR) 2>/dev/null
 		ar r $(USERLIB) $(USEROBJ)
 		ranlib $(USERLIB)
-		cp -vax Rcpp.h $(USERDIR)
+		cp -vax Rcp*.h $(USERDIR)