max/iphreeqc
1
0
Fork 0
mirror of https://git.gfz-potsdam.de/naaice/iphreeqc.git synced 2025-12-15 16:18:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

updated for Keywords

Browse Source 
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9344 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
Scott R Charlton 2015-03-10 21:51:55 +00:00
parent 6db24c4ddf
commit 5f878fe396
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
IPhreeqc.2008.vcproj
View File

@ -48,7 +48,7 @@
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="src;src/phreeqcpp" AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB" PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -121,7 +121,7 @@
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="src;src/phreeqcpp" AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB" PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
StringPooling="true" StringPooling="true"
RuntimeLibrary="0" RuntimeLibrary="0"
@ -160,7 +160,7 @@
/> />
<Tool <Tool
Name="VCPostBuildEventTool" Name="VCPostBuildEventTool"
CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=libx64&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;" CommandLine="SETLOCAL&#x0D;&#x0A;set DEST=libx64&#x0D;&#x0A;if not exist %DEST% mkdir %DEST%&#x0D;&#x0A;copy &quot;$(TargetDir)$(TargetName).lib&quot; &quot;%DEST%\$(TargetName).lib&quot;&#x0D;&#x0A;"
/> />
</Configuration> </Configuration>
<Configuration <Configuration
@ -192,7 +192,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="src;src/phreeqcpp" AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB" PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
MinimalRebuild="false" MinimalRebuild="false"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -266,7 +266,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="src;src/phreeqcpp" AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB" PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="1" RuntimeLibrary="1"
@ -339,7 +339,7 @@
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="src;src/phreeqcpp" AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB" PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -421,7 +421,7 @@
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="2" Optimization="2"
InlineFunctionExpansion="1" InlineFunctionExpansion="1"
AdditionalIncludeDirectories="src;src/phreeqcpp" AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="NDEBUG;WIN32;_LIB" PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
StringPooling="true" StringPooling="true"
RuntimeLibrary="2" RuntimeLibrary="2"
@ -501,7 +501,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="src;src/phreeqcpp" AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB" PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
MinimalRebuild="false" MinimalRebuild="false"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
@ -584,7 +584,7 @@
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
AdditionalOptions="/MP" AdditionalOptions="/MP"
Optimization="0" Optimization="0"
AdditionalIncludeDirectories="src;src/phreeqcpp" AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
PreprocessorDefinitions="_DEBUG;WIN32;_LIB" PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
BasicRuntimeChecks="3" BasicRuntimeChecks="3"
RuntimeLibrary="3" RuntimeLibrary="3"
@ -993,7 +993,7 @@
> >
</File> </File>
<File <File
RelativePath=".\src\phreeqcpp\Keywords.cpp" RelativePath=".\src\phreeqcpp\PhreeqcKeywords\Keywords.cpp"
> >
</File> </File>
<File <File

18
IPhreeqc.vcxproj
View File

@ -146,7 +146,7 @@
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -182,7 +182,7 @@ copy "$(OutDir)vc100.pdb" "lib\vc100.pdb"
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -211,7 +211,7 @@ copy "$(OutDir)$(TargetName)$(TargetExt)" "libx64\$(TargetName)$(TargetExt)"</Co
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -246,7 +246,7 @@ copy "$(OutDir)vc100.pdb" "lib\vc100.pdb"</Command>
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -280,7 +280,7 @@ copy "$(OutDir)vc100.pdb" "libx64\vc100.pdb"
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -317,7 +317,7 @@ copy "$(OutDir)$(TargetName).lib" "dll\$(TargetName).lib"
<ClCompile> <ClCompile>
<Optimization>MaxSpeed</Optimization> <Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
<AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>NDEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@ -349,7 +349,7 @@ copy "$(OutDir)$(TargetName).lib" "dllx64\$(TargetName).lib"
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -387,7 +387,7 @@ copy "$(OutDir)vc100.pdb" "dll\vc100.pdb"
</Midl> </Midl>
<ClCompile> <ClCompile>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/phreeqc;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>_DEBUG;WIN32;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -447,6 +447,7 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb"
</ClCompile> </ClCompile>
<ClCompile Include="src\IPhreeqc.cpp" /> <ClCompile Include="src\IPhreeqc.cpp" />
<ClCompile Include="src\IPhreeqcLib.cpp" /> <ClCompile Include="src\IPhreeqcLib.cpp" />
<ClCompile Include="src\phreeqcpp\PhreeqcKeywords\Keywords.cpp" />
<ClCompile Include="src\phreeqcpp\SelectedOutput.cpp" /> <ClCompile Include="src\phreeqcpp\SelectedOutput.cpp" />
<ClCompile Include="src\phreeqcpp\UserPunch.cpp" /> <ClCompile Include="src\phreeqcpp\UserPunch.cpp" />
<ClCompile Include="src\Var.c"> <ClCompile Include="src\Var.c">
@ -464,7 +465,6 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb"
<ClCompile Include="src\phreeqcpp\GasPhase.cxx" /> <ClCompile Include="src\phreeqcpp\GasPhase.cxx" />
<ClCompile Include="src\phreeqcpp\ISolution.cxx" /> <ClCompile Include="src\phreeqcpp\ISolution.cxx" />
<ClCompile Include="src\phreeqcpp\ISolutionComp.cxx" /> <ClCompile Include="src\phreeqcpp\ISolutionComp.cxx" />
<ClCompile Include="src\phreeqcpp\Keywords.cpp" />
<ClCompile Include="src\phreeqcpp\KineticsComp.cxx" /> <ClCompile Include="src\phreeqcpp\KineticsComp.cxx" />
<ClCompile Include="src\phreeqcpp\NameDouble.cxx" /> <ClCompile Include="src\phreeqcpp\NameDouble.cxx" />
<ClCompile Include="src\phreeqcpp\NumKeyword.cxx" /> <ClCompile Include="src\phreeqcpp\NumKeyword.cxx" />

6
IPhreeqc.vcxproj.filters
View File

@ -59,9 +59,6 @@
<ClCompile Include="src\phreeqcpp\ISolutionComp.cxx"> <ClCompile Include="src\phreeqcpp\ISolutionComp.cxx">
<Filter>Source Files\phreeqcpp</Filter> <Filter>Source Files\phreeqcpp</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\phreeqcpp\Keywords.cpp">
<Filter>Source Files\phreeqcpp</Filter>
</ClCompile>
<ClCompile Include="src\phreeqcpp\KineticsComp.cxx"> <ClCompile Include="src\phreeqcpp\KineticsComp.cxx">
<Filter>Source Files\phreeqcpp</Filter> <Filter>Source Files\phreeqcpp</Filter>
</ClCompile> </ClCompile>
@ -278,6 +275,9 @@
<ClCompile Include="src\phreeqcpp\UserPunch.cpp"> <ClCompile Include="src\phreeqcpp\UserPunch.cpp">
<Filter>Source Files\phreeqcpp</Filter> <Filter>Source Files\phreeqcpp</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\phreeqcpp\PhreeqcKeywords\Keywords.cpp">
<Filter>Source Files\phreeqcpp</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="src\CVar.hxx"> <ClInclude Include="src\CVar.hxx">