[Rcpp-commits] r529 - pkg/src

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

Author: romain
Date: 2010-01-31 19:42:37 +0100 (Sun, 31 Jan 2010)
New Revision: 529

Modified:
   pkg/src/Makevars.win
   pkg/src/RcppDatetime.cpp
Log:
apply patch from Brian Ripley and Uwe Ligges for enabling windows 64 builds

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-01-31 11:48:33 UTC (rev 528)
+++ pkg/src/Makevars.win	2010-01-31 18:42:37 UTC (rev 529)
@@ -31,7 +31,7 @@
 ## users need for their projects -- RcppExample is used by the package library
 ## we place it inside the inst/ directory so that it gets installed by the package
 USEROBJ	=	$(filter-out RcppExample.o,$(OBJECTS))
-USERDIR	= 	../inst/lib
+USERDIR	= 	../inst/lib$(R_ARCH)
 USERLIB	= 	$(USERDIR)/libRcpp.a
 
 ## to filter out -Wall which generated a ton with older compilers
@@ -64,8 +64,8 @@
 
 $(USERLIB):	$(USEROBJ)
 		-mkdir -p $(USERDIR)/Rcpp/internal 2>/dev/null
-		ar r $(USERLIB) $(USEROBJ)
-		ranlib $(USERLIB)
+		$(AR) r $(USERLIB) $(USEROBJ)
+		$(RANLIB) $(USERLIB)
 		cp -vax *.h $(USERDIR)
 		cp -vax Rcpp/*.h $(USERDIR)/Rcpp
 		cp -vax Rcpp/internal/*.h $(USERDIR)/Rcpp/internal

Modified: pkg/src/RcppDatetime.cpp
===================================================================
--- pkg/src/RcppDatetime.cpp	2010-01-31 11:48:33 UTC (rev 528)
+++ pkg/src/RcppDatetime.cpp	2010-01-31 18:42:37 UTC (rev 529)
@@ -20,6 +20,7 @@
 // along with Rcpp.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <RcppDatetime.h>
+#include <time.h> // for strftime
 
 RcppDatetime::RcppDatetime(void) : m_d(0), 
 				   m_parsed(false),