[Rinside-commits] r115 - pkg/src

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

Author: edd
Date: 2010-03-11 00:49:32 +0100 (Thu, 11 Mar 2010)
New Revision: 115

Modified:
   pkg/src/Makefile.win
Log:
also link to Rcpp's library


Modified: pkg/src/Makefile.win
===================================================================
--- pkg/src/Makefile.win	2010-03-10 22:06:19 UTC (rev 114)
+++ pkg/src/Makefile.win	2010-03-10 23:49:32 UTC (rev 115)
@@ -41,6 +41,7 @@
 RLDFLAGS := 		$(shell $(R_HOME)/bin/R CMD config --ldflags)
 
 RCPPINCL := 		$(shell echo 'Rcpp:::CxxFlags()' | $(R_HOME)/bin/R --vanilla --slave)
+RCPPLIB := 		$(shell echo 'Rcpp:::LdFlags()' | $(R_HOME)/bin/R --vanilla --slave)
 
 CXX := 			$(shell $(R_HOME)/bin/R CMD config CXX)
 CPPFLAGS := 		-Wall $(shell $(R_HOME)/bin/R CMD config CPPFLAGS)
@@ -69,7 +70,7 @@
 			rm $(USERLIB) $(USERLIBST)
 
 $(USERLIB) : 		$(HEADERS) $(OBJECTS)
-			$(CXX) -Wl,--export-all-symbols -shared -o $(USERLIB) $(OBJECTS) $(RLDFLAGS) $(ALL_LIBS) -lws2_32
+			$(CXX) -Wl,--export-all-symbols -shared -o $(USERLIB) $(OBJECTS) $(RCPPLIB) $(RLDFLAGS) $(ALL_LIBS) -lws2_32
 			@if test -e "/usr/bin/install_name_tool"; then \
 				/usr/bin/install_name_tool -id $(R_PACKAGE_DIR)/lib$(R_ARCH)/$(USERLIB) $(USERLIB); fi