[Rinside-commits] r165 - pkg/src

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

Author: romain
Date: 2010-06-15 18:22:41 +0200 (Tue, 15 Jun 2010)
New Revision: 165

Modified:
   pkg/src/Makevars.win
Log:
take 3

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-06-15 16:10:40 UTC (rev 164)
+++ pkg/src/Makevars.win	2010-06-15 16:22:41 UTC (rev 165)
@@ -16,6 +16,7 @@
 ## along with RInside.  If not, see <http://www.gnu.org/licenses/>.
 
 USERLIBST=libRInside.a
+USERLIB=libRInside.dll
 USERDIR=../inst/lib
 
 PKG_CPPFLAGS += -I../inst/include/
@@ -23,18 +24,21 @@
 
 all:	$(SHLIB) userLibrary
 
-userLibrary: $(USERLIBST)
+userLibrary: $(USERLIBST) $(USERLIB)
 	- at if test ! -e $(USERDIR)$(R_ARCH); then mkdir -p $(USERDIR)$(R_ARCH); fi
-	cp $(SHLIB) $(USERDIR)$(R_ARCH)/libRInside.dll
+	cp $(USERLIB) $(USERDIR)$(R_ARCH)
 	cp $(USERLIBST) $(USERDIR)$(R_ARCH)
 	rm $(USERLIBST)
 
 $(USERLIBST): $(OBJECTS)
 	$(AR) qc $(USERLIBST) $^
 	@if test -n "$(RANLIB)"; then $(RANLIB) $(USERLIBST); fi
-			
+
+$(USERLIB): $(OBJECTS)
+	$(CXX) -Wl,--export-all-symbols -shared -o $(USERLIB) $^ $(ALL_LIBS) -lws2_32
+	
 .PHONY: all clean userLibrary
 
 clean:
-	rm -f $(OBJECTS) $(SHLIB) $(USERLIBST)
+	rm -f $(OBJECTS) $(SHLIB) $(USERLIBST) $(USERLIB)