[Rquantlib-commits] r281 - pkg/RQuantLib/src

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

Author: edd
Date: 2010-08-02 22:39:21 +0200 (Mon, 02 Aug 2010)
New Revision: 281

Added:
   pkg/RQuantLib/src/Makevars.win
Removed:
   pkg/RQuantLib/src/Makefile.win
Log:
switch from Makefile.win to Makevars.win to simplify greatly
also update path to Rscript.exe while we're at it


Deleted: pkg/RQuantLib/src/Makefile.win
===================================================================
--- pkg/RQuantLib/src/Makefile.win	2010-08-02 20:35:40 UTC (rev 280)
+++ pkg/RQuantLib/src/Makefile.win	2010-08-02 20:39:21 UTC (rev 281)
@@ -1,27 +0,0 @@
-# -*- mode: Makefile -*-
-#
-# Copyright 2005 - 2006 Dominick Samperi
-# Copyright 2005        Uwe Ligges
-# Copyright 2008 - 2010 Dirk Eddelbuettel
-
-RCPP_INCFLAGS	= `Rscript -e 'Rcpp:::CxxFlags()'`
-RCPP_LDFLAGS	= `Rscript -e 'Rcpp:::LdFlags()'`
-
-BIN		= RQuantLib.dll
-CXXFLAGS	= -I$(RHOME)/include -I$(RHOME)/src/include $(RCPP_INCFLAGS) -I$(QUANTLIB_ROOT) -I. -Wall -O2
-
-SOURCES		:= $(wildcard *.cpp)
-LINKOBJ		:= $(SOURCES:.cpp=.o)
-
-DLLLIBS		= -s -L$(RHOME)/bin -lR $(RCPP_LDFLAGS) -L$(QUANTLIB_ROOT)/lib -lQuantLib-mgw-0_9_9
-
-.PHONY: 	all clean
-
-all: 		RQuantLib.dll
-
-clean:
-		rm -f $(LINKOBJ) $(BIN)
-
-$(BIN): 	$(LINKOBJ)
-		$(CXX) -shared $(LINKOBJ) $(DLLLIBS) -o $(BIN)
-

Copied: pkg/RQuantLib/src/Makevars.win (from rev 280, pkg/RQuantLib/src/Makefile.win)
===================================================================
--- pkg/RQuantLib/src/Makevars.win	                        (rev 0)
+++ pkg/RQuantLib/src/Makevars.win	2010-08-02 20:39:21 UTC (rev 281)
@@ -0,0 +1,14 @@
+# -*- mode: Makefile -*-
+#
+# Copyright 2005 - 2006 Dominick Samperi
+# Copyright 2005        Uwe Ligges
+# Copyright 2008 - 2010 Dirk Eddelbuettel
+
+## This assume 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
+PKG_CXXFLAGS=-I$(QUANTLIB_ROOT) -I. 
+PKG_LIBS=$(RCPP_LDFLAGS) -L$(QUANTLIB_ROOT)/lib -lQuantLib-mgw-0_9_9
+