[Phylobase-commits] r696 - pkg/src

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

Author: regetz
Date: 2009-10-26 23:38:13 +0100 (Mon, 26 Oct 2009)
New Revision: 696

Added:
   pkg/src/Makevars.win
Removed:
   pkg/src/Makefile.win
Log:
replacing Makefile.win with Makevars.win, in an attempt to fix problem
with src/*.c files being ignored during the Windows build process


Deleted: pkg/src/Makefile.win
===================================================================
--- pkg/src/Makefile.win	2009-10-26 01:13:19 UTC (rev 695)
+++ pkg/src/Makefile.win	2009-10-26 22:38:13 UTC (rev 696)
@@ -1,29 +0,0 @@
-# Project: RcppTemplate
-# Makefile created by Dev-C++ 4.9.9.2
-# modified bei UL in order to fit mingw and R requirements, 16.09.2005
-
-#This include causes many warnings and other issues, and doesn't seem to be needed!
-#include $(RHOME)/src/gnuwin32/MkRules
-
-OBJ = NCLInterface.o ReadWithNCL.o
-LINKOBJ  = NCLInterface.o ReadWithNCL.o $(RES)
-DLLLIBS = -s -L RcppSrc -lRcpp -L"$(RHOME)/bin" -lR -L ncl/ncl -lncl --no-export-all-symbols --add-stdcall-alias
-BIN  = phylobase.dll
-CXXFLAGS = -I RcppSrc -I ncl/ncl -I"$(RHOME)/include" -I"$(RHOME)/src/include" -Wall -O2 -DBUILDING_DLL=1
-RM = rm -f
-
-.PHONY: all clean
-
-all: phylobase.dll
-
-clean:
-	${RM} $(LINKOBJ) $(BIN)
-
-$(BIN): $(LINKOBJ)
-	$(CXX) -shared $(LINKOBJ) $(DLLLIBS) -o $(BIN)
-
-NCLInterface.o: NCLInterface.cpp
-	$(CXX) -c NCLInterface.cpp -o NCLInterface.o $(CXXFLAGS)
-    
-ReadWithNCL.o: ReadWithNCL.cpp
-	$(CXX) -c ReadWithNCL.cpp -o ReadWithNCL.o $(CXXFLAGS)

Added: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	                        (rev 0)
+++ pkg/src/Makevars.win	2009-10-26 22:38:13 UTC (rev 696)
@@ -0,0 +1,2 @@
+PKG_LIBS = -s -L RcppSrc -lRcpp -L"$(RHOME)/bin" -lR -L ncl/ncl -lncl --no-export-all-symbols --add-stdcall-alias
+PKG_CXXFLAGS = -I RcppSrc -I ncl/ncl -DBUILDING_DLL=1