[Phylobase-commits] r236 - branches/nclrepair/src

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

Author: bcomeara
Date: 2008-08-04 17:03:09 +0200 (Mon, 04 Aug 2008)
New Revision: 236

Added:
   branches/nclrepair/src/Makefile
Modified:
   branches/nclrepair/src/NCLInterface.cpp
Log:
added a makefile that should build ncl

Added: branches/nclrepair/src/Makefile
===================================================================
--- branches/nclrepair/src/Makefile	                        (rev 0)
+++ branches/nclrepair/src/Makefile	2008-08-04 15:03:09 UTC (rev 236)
@@ -0,0 +1,38 @@
+# 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
+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)
+
+
+NCLInterface.o: NCLInterface.cpp
+	${RM} $(LINKOBJ)
+	cd ncl
+	sh bootstrap.sh
+        cd ..
+        mkdir build
+        cd build
+        ../v2.1/configure
+        make
+        make check
+        make install
+        make installcheck
+
+	$(CXX) -c NCLInterface.cpp -o NCLInterface.o $(CXXFLAGS)
+    
+ReadWithNCL.o: ReadWithNCL.cpp
+	$(CXX) -c ReadWithNCL.cpp -o ReadWithNCL.o $(CXXFLAGS)

Modified: branches/nclrepair/src/NCLInterface.cpp
===================================================================
--- branches/nclrepair/src/NCLInterface.cpp	2008-08-04 14:42:40 UTC (rev 235)
+++ branches/nclrepair/src/NCLInterface.cpp	2008-08-04 15:03:09 UTC (rev 236)
@@ -21,7 +21,7 @@
 //	59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
 
-#include "ncl.h"
+#include "ncl/ncl/ncl.h"
 #include "NCLInterface.h"
 #include <sstream>