[Phylobase-commits] r731 - in pkg: . src src/ncl/ncl

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

Author: edd
Date: 2010-01-31 15:56:45 +0100 (Sun, 31 Jan 2010)
New Revision: 731

Added:
   pkg/src/ncl/ncl/Makefile.win
Modified:
   pkg/configure.win
   pkg/src/Makevars.win
Log:
Windows build fixes


Modified: pkg/configure.win
===================================================================
--- pkg/configure.win	2010-01-30 22:41:07 UTC (rev 730)
+++ pkg/configure.win	2010-01-31 14:56:45 UTC (rev 731)
@@ -1,2 +1,5 @@
+echo "Configuring phylobase -- starting to build NCL"
 cd src/ncl/ncl
 make -f Makefile.win
+echo "Configuring phylobase -- finished building NCL"
+cd ../../..

Modified: pkg/src/Makevars.win
===================================================================
--- pkg/src/Makevars.win	2010-01-30 22:41:07 UTC (rev 730)
+++ pkg/src/Makevars.win	2010-01-31 14:56:45 UTC (rev 731)
@@ -1,2 +1,2 @@
-PKG_LIBS = -s `Rscript -e 'Rcpp:::LdFlags()'` -L"$(RHOME)/bin" -lR -L ncl/ncl -lncl --no-export-all-symbols --add-stdcall-alias
-PKG_CXXFLAGS = `Rscript -e 'Rcpp:::CxxFlags()'` -I ncl/ncl 
+PKG_LIBS = -s `Rscript -e 'Rcpp:::LdFlags()'` -L"$(RHOME)/bin" -lR -Lncl/ncl -lncl --no-export-all-symbols --add-stdcall-alias
+PKG_CXXFLAGS = `Rscript -e 'Rcpp:::CxxFlags()'` -Incl/

Added: pkg/src/ncl/ncl/Makefile.win
===================================================================
--- pkg/src/ncl/ncl/Makefile.win	                        (rev 0)
+++ pkg/src/ncl/ncl/Makefile.win	2010-01-31 14:56:45 UTC (rev 731)
@@ -0,0 +1,64 @@
+##
+
+SRC = \
+	nxsassumptionsblock.cpp \
+	nxsblock.cpp \
+	nxscharactersblock.cpp \
+	nxscxxdiscretematrix.cpp \
+	nxsdatablock.cpp \
+	nxsdistancedatum.cpp \
+	nxsdistancesblock.cpp \
+	nxsexception.cpp \
+	nxsmultiformat.cpp \
+	nxspublicblocks.cpp \
+	nxsreader.cpp \
+	nxssetreader.cpp \
+	nxsstring.cpp \
+	nxstaxablock.cpp \
+	nxstoken.cpp \
+	nxstreesblock.cpp \
+	nxsunalignedblock.cpp 
+
+## nxsemptyblock.cpp 
+
+OBJ = \
+	nxsassumptionsblock.o \
+	nxsblock.o \
+	nxscharactersblock.o \
+	nxscxxdiscretematrix.o \
+	nxsdatablock.o \
+	nxsdistancedatum.o \
+	nxsdistancesblock.o \
+	nxsexception.o \
+	nxsmultiformat.o \
+	nxspublicblocks.o \
+	nxsreader.o \
+	nxssetreader.o \
+	nxsstring.o \
+	nxstaxablock.o \
+	nxstoken.o \
+	nxstreesblock.o \
+	nxsunalignedblock.o 
+
+LINKOBJ = $(OBJ) $(RES)
+
+DLLLIBS = -s  --no-export-all-symbols --add-stdcall-alias
+LIB  = libncl.a
+CXXFLAGS = $(CPPFLAGS) -Wall -O2 -I..
+RM = rm -f
+	
+.PHONY: all all-before all-after clean clean-custom
+
+all: all-before libncl.a  all-after
+
+clean: clean-custom
+	${RM} $(LINKOBJ) $(LIB)
+
+$(OBJ): $(SRC)
+	$(CXX) -c $*.cpp -o $*.o $(CXXFLAGS)
+	
+$(LIB): $(LINKOBJ)
+	ar r $(LIB) $(OBJ)
+	ranlib $(LIB)
+	rm $(OBJ)
+