From a44bcec013d5d57c676b31bc718bdd5469193678 Mon Sep 17 00:00:00 2001
From: Scott R Charlton <charlton@usgs.gov>
Date: Tue, 10 Sep 2013 22:57:00 +0000
Subject: [PATCH] updates reqd for vs2010

git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@8025 1feff8c3-07ed-0310-ac33-dd36852eb9cd
---
 IPhreeqc.vcxproj          |   6 +-
 IPhreeqc.vcxproj.filters  | 233 ++++++++++++++++++------------------
 unit/unit.vcxproj         |  19 +--
 unit/unit.vcxproj.filters | 240 +++++++++++++++++++-------------------
 4 files changed, 247 insertions(+), 251 deletions(-)

diff --git a/IPhreeqc.vcxproj b/IPhreeqc.vcxproj
index c693bb11..20723452 100644
--- a/IPhreeqc.vcxproj
+++ b/IPhreeqc.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="DebugDll|Win32">
@@ -421,6 +421,7 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb"
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="src\CSelectedOutput.cpp" />
     <ClCompile Include="src\fwrap.cpp" />
     <ClCompile Include="src\fwrap2.cpp" />
     <ClCompile Include="src\fwrap3.cpp" />
@@ -446,7 +447,8 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb"
     </ClCompile>
     <ClCompile Include="src\IPhreeqc.cpp" />
     <ClCompile Include="src\IPhreeqcLib.cpp" />
-    <ClCompile Include="src\SelectedOutput.cpp" />
+    <ClCompile Include="src\phreeqcpp\SelectedOutput.cpp" />
+    <ClCompile Include="src\phreeqcpp\UserPunch.cpp" />
     <ClCompile Include="src\Var.c">
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">CompileAsCpp</CompileAs>
       <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
diff --git a/IPhreeqc.vcxproj.filters b/IPhreeqc.vcxproj.filters
index 7503399c..3c0669aa 100644
--- a/IPhreeqc.vcxproj.filters
+++ b/IPhreeqc.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -8,9 +8,6 @@
     <Filter Include="Source Files\phreeqcpp">
       <UniqueIdentifier>{0ad80600-706e-4da7-b54e-c014fcbba4a6}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\phreeqcpp\phreeqc">
-      <UniqueIdentifier>{1011cb9f-ff20-4a82-9a89-7914b91c2b46}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{0b7d37b3-2c42-4a8b-a97a-7a2f812581d6}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
@@ -32,9 +29,6 @@
     <ClCompile Include="src\IPhreeqcLib.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\SelectedOutput.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\Var.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -152,114 +146,6 @@
     <ClCompile Include="src\phreeqcpp\Utils.cxx">
       <Filter>Source Files\phreeqcpp</Filter>
     </ClCompile>
-    <ClCompile Include="src\phreeqcpp\advection.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\basicsubs.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\cl1.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\cvdense.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\cvode.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\dense.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\dw.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\gases.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\input.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\integrate.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\inverse.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\isotopes.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\kinetics.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\mainsubs.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\model.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\nvector.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\nvector_serial.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\parse.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\phqalloc.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\PHRQ_io_output.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\pitzer.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\pitzer_structures.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\prep.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\print.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\read.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\readtr.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\sit.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\smalldense.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\spread.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\step.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\structures.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\sundialsmath.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\tally.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\tidy.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\transport.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="src\phreeqcpp\utilities.cpp">
-      <Filter>Source Files\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
     <ClCompile Include="src\fwrap4.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -275,6 +161,123 @@
     <ClCompile Include="src\fwrap8.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\CSelectedOutput.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\advection.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\utilities.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\basicsubs.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\cl1.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\cvdense.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\cvode.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\dense.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\dw.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\gases.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\input.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\integrate.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\inverse.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\isotopes.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\kinetics.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\mainsubs.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\model.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\nvector.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\nvector_serial.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\parse.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\phqalloc.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\PHRQ_io_output.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\pitzer.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\pitzer_structures.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\prep.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\print.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\read.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\readtr.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\sit.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\smalldense.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\spread.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\step.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\structures.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\sundialsmath.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\tally.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\tidy.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\transport.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\SelectedOutput.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="src\phreeqcpp\UserPunch.cpp">
+      <Filter>Source Files\phreeqcpp</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\CVar.hxx">
diff --git a/unit/unit.vcxproj b/unit/unit.vcxproj
index 43f30bc6..c0f68ece 100644
--- a/unit/unit.vcxproj
+++ b/unit/unit.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -180,6 +180,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="..\src\CSelectedOutput.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\SelectedOutput.cpp" />
+    <ClCompile Include="..\src\phreeqcpp\UserPunch.cpp" />
+    <ClCompile Include="FileTest.cpp" />
     <ClCompile Include="TestCVar.cpp">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -208,7 +212,6 @@
     </ClCompile>
     <ClCompile Include="..\src\IPhreeqc.cpp" />
     <ClCompile Include="..\src\IPhreeqcLib.cpp" />
-    <ClCompile Include="..\src\SelectedOutput.cpp" />
     <ClCompile Include="..\src\Var.c">
       <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -225,12 +228,6 @@
     </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\cxxKinetics.cxx" />
     <ClCompile Include="..\src\phreeqcpp\cxxMix.cxx" />
-    <ClCompile Include="..\src\phreeqcpp\Dictionary.cxx">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\dumper.cpp" />
     <ClCompile Include="..\src\phreeqcpp\Exchange.cxx" />
     <ClCompile Include="..\src\phreeqcpp\ExchComp.cxx" />
@@ -253,12 +250,6 @@
     <ClCompile Include="..\src\phreeqcpp\Reaction.cxx" />
     <ClCompile Include="..\src\phreeqcpp\ReadClass.cxx" />
     <ClCompile Include="..\src\phreeqcpp\runner.cpp" />
-    <ClCompile Include="..\src\phreeqcpp\SAXPhreeqc.cxx">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\Solution.cxx" />
     <ClCompile Include="..\src\phreeqcpp\SolutionIsotope.cxx" />
     <ClCompile Include="..\src\phreeqcpp\SS.cxx" />
diff --git a/unit/unit.vcxproj.filters b/unit/unit.vcxproj.filters
index ccbe8712..6e9bc8d7 100644
--- a/unit/unit.vcxproj.filters
+++ b/unit/unit.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
@@ -11,9 +11,6 @@
     <Filter Include="Source Files\src\phreeqcpp">
       <UniqueIdentifier>{2b87fae0-9021-449c-ab6c-2462b25f8451}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Source Files\src\phreeqcpp\phreeqc">
-      <UniqueIdentifier>{21c6e9cb-086c-4892-a2cd-eecbc33251a1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Header Files">
       <UniqueIdentifier>{af607a11-f999-462d-a895-27b23d9837d7}</UniqueIdentifier>
       <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions>
@@ -48,9 +45,6 @@
     <ClCompile Include="..\src\IPhreeqcLib.cpp">
       <Filter>Source Files\src</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\SelectedOutput.cpp">
-      <Filter>Source Files\src</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\Var.c">
       <Filter>Source Files\src</Filter>
     </ClCompile>
@@ -63,9 +57,6 @@
     <ClCompile Include="..\src\phreeqcpp\cxxMix.cxx">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\Dictionary.cxx">
-      <Filter>Source Files\src\phreeqcpp</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\dumper.cpp">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
@@ -132,9 +123,6 @@
     <ClCompile Include="..\src\phreeqcpp\runner.cpp">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\SAXPhreeqc.cxx">
-      <Filter>Source Files\src\phreeqcpp</Filter>
-    </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\Solution.cxx">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
@@ -177,116 +165,128 @@
     <ClCompile Include="..\src\phreeqcpp\Utils.cxx">
       <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
+    <ClCompile Include="..\src\CSelectedOutput.cpp">
+      <Filter>Source Files\src</Filter>
+    </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\advection.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\basicsubs.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\cl1.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\cl1mp.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\cvdense.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\cvode.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\dense.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\dw.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\gases.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\input.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\integrate.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\inverse.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\isotopes.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\kinetics.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\mainsubs.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\model.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\nvector.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\nvector_serial.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\parse.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\phqalloc.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\PHRQ_io_output.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\pitzer.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\pitzer_structures.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\prep.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\print.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\read.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\readtr.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\sit.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\smalldense.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\spread.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\step.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\structures.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\sundialsmath.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\tally.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\tidy.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\src\phreeqcpp\transport.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+      <Filter>Source Files\src\phreeqcpp</Filter>
     </ClCompile>
     <ClCompile Include="..\src\phreeqcpp\utilities.cpp">
-      <Filter>Source Files\src\phreeqcpp\phreeqc</Filter>
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\basicsubs.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\cl1.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\cl1mp.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\cvdense.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\cvode.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\dense.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\dw.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\gases.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\input.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\integrate.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\inverse.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\isotopes.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\kinetics.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\mainsubs.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\model.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\nvector.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\nvector_serial.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\parse.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\phqalloc.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\PHRQ_io_output.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\pitzer.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\pitzer_structures.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\prep.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\print.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\read.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\readtr.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\sit.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\smalldense.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\spread.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\step.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\structures.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\sundialsmath.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\tally.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\tidy.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\transport.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\SelectedOutput.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\phreeqcpp\UserPunch.cpp">
+      <Filter>Source Files\src\phreeqcpp</Filter>
+    </ClCompile>
+    <ClCompile Include="FileTest.cpp">
+      <Filter>Source Files</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>