From 94cac8272b070392bdde35d759b4a9eccd2b4892 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Tue, 29 Dec 2015 05:23:30 +0000 Subject: [PATCH] updated for Dictionary/Serializer git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@10619 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- R/Makefile | 16 ++++++++++++++++ R/Makevars | 2 ++ 2 files changed, 18 insertions(+) diff --git a/R/Makefile b/R/Makefile index c88ac8e1..9157b224 100644 --- a/R/Makefile +++ b/R/Makefile @@ -99,6 +99,8 @@ PSRC = \ $(DEST)/cxxMix.h \ $(DEST)/dense.cpp \ $(DEST)/dense.h \ + $(DEST)/Dictionary.cpp \ + $(DEST)/Dictionary.h \ $(DEST)/dumper.cpp \ $(DEST)/dumper.h \ $(DEST)/dw.cpp \ @@ -170,6 +172,8 @@ PSRC = \ $(DEST)/runner.h \ $(DEST)/SelectedOutput.cpp \ $(DEST)/SelectedOutput.h \ + $(DEST)/Serializer.cpp \ + $(DEST)/Serializer.h \ $(DEST)/sit.cpp \ $(DEST)/smalldense.cpp \ $(DEST)/smalldense.h \ @@ -330,6 +334,12 @@ $(DEST)/dense.cpp : $(SRC)/dense.cpp $(DEST)/dense.h : $(SRC)/dense.h $(CP) $< $@ +$(DEST)/Dictionary.cpp : $(SRC)/Dictionary.cpp + $(CP) $< $@ + +$(DEST)/Dictionary.h : $(SRC)/Dictionary.h + $(CP) $< $@ + $(DEST)/dumper.cpp : $(SRC)/dumper.cpp $(CP) $< $@ @@ -543,6 +553,12 @@ $(DEST)/SelectedOutput.cpp : $(SRC)/SelectedOutput.cpp $(DEST)/SelectedOutput.h : $(SRC)/SelectedOutput.h $(CP) $< $@ +$(DEST)/Serializer.cpp : $(SRC)/Serializer.cxx + $(CP) $< $@ + +$(DEST)/Serializer.h : $(SRC)/Serializer.h + $(CP) $< $@ + $(DEST)/sit.cpp : $(SRC)/sit.cpp $(CP) $< $@ diff --git a/R/Makevars b/R/Makevars index de5fdbb5..f0ae6dec 100644 --- a/R/Makevars +++ b/R/Makevars @@ -17,6 +17,7 @@ OBJECTS.phreeqcpp = \ phreeqcpp/cxxKinetics.o \ phreeqcpp/cxxMix.o \ phreeqcpp/dense.o \ + phreeqcpp/Dictionary.o \ phreeqcpp/dumper.o \ phreeqcpp/dw.o \ phreeqcpp/Exchange.o \ @@ -60,6 +61,7 @@ OBJECTS.phreeqcpp = \ phreeqcpp/readtr.o \ phreeqcpp/runner.o \ phreeqcpp/SelectedOutput.o \ + phreeqcpp/Serializer.o \ phreeqcpp/sit.o \ phreeqcpp/smalldense.o \ phreeqcpp/SolutionIsotope.o \