[Rquantlib-commits] r311 - in pkg/RQuantLib: . src

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

Author: edd
Date: 2011-04-03 23:00:55 +0200 (Sun, 03 Apr 2011)
New Revision: 311

Modified:
   pkg/RQuantLib/ChangeLog
   pkg/RQuantLib/src/Makevars.win
Log:
support 32 and 64 bit Windows


Modified: pkg/RQuantLib/ChangeLog
===================================================================
--- pkg/RQuantLib/ChangeLog	2011-04-03 18:54:48 UTC (rev 310)
+++ pkg/RQuantLib/ChangeLog	2011-04-03 21:00:55 UTC (rev 311)
@@ -6,6 +6,9 @@
 	* man/Enum.Rd: Idem
 	* man/FittedBondCurve.Rd: Idem
 
+	* src/Makevars.win: Adjust link command to '-lQuantLib', and support
+	32 and 64 bit builds of the QuantLib library
+
 2011-02-21  Dirk Eddelbuettel  <edd at debian.org>
 
 	* DESCRIPTION: Release 0.3.6

Modified: pkg/RQuantLib/src/Makevars.win
===================================================================
--- pkg/RQuantLib/src/Makevars.win	2011-04-03 18:54:48 UTC (rev 310)
+++ pkg/RQuantLib/src/Makevars.win	2011-04-03 21:00:55 UTC (rev 311)
@@ -2,13 +2,19 @@
 #
 # Copyright 2005 - 2006 Dominick Samperi
 # Copyright 2005        Uwe Ligges
-# Copyright 2008 - 2010 Dirk Eddelbuettel
+# Copyright 2008 - 2011 Dirk Eddelbuettel
+# Copyright 2011        Uwe Ligges, Brian Ripley, and Josh Ulrich
 
-## This assume that we can call Rscript to ask Rcpp about its locations
+## 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
 RCPP_LDFLAGS = $(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript.exe" -e "Rcpp:::LdFlags()")
 
 ## The environment variable QUANTLIB_ROOT has to point to an existing build of QuantLib
+## With R 2.12.0 and later, we also support 32 and 64 bit builds and need to differentiate
 PKG_CXXFLAGS=-I$(QUANTLIB_ROOT) -I. 
-PKG_LIBS=$(RCPP_LDFLAGS) -L$(QUANTLIB_ROOT)/lib -lQuantLib-mgw-0_9_9
+ifeq ("$(WIN)", "64")
+  PKG_LIBS=$(RCPP_LDFLAGS) -L$(QUANTLIB_ROOT)/lib/x64 -lQuantLib
+else
+  PKG_LIBS=$(RCPP_LDFLAGS) -L$(QUANTLIB_ROOT)/lib/i386 -lQuantLib
+endif