mirror of
https://git.gfz-potsdam.de/naaice/iphreeqc.git
synced 2025-12-13 07:08:23 +01:00
updated for Keywords
git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@9344 1feff8c3-07ed-0310-ac33-dd36852eb9cd
This commit is contained in:
parent
6db24c4ddf
commit
5f878fe396
@ -48,7 +48,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
@ -121,7 +121,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="0"
|
||||
@ -160,7 +160,7 @@
|
||||
/>
|
||||
<Tool
|
||||
Name="VCPostBuildEventTool"
|
||||
CommandLine="SETLOCAL
set DEST=libx64
if not exist %DEST% mkdir %DEST%
copy "$(TargetDir)$(TargetName).lib" "%DEST%\$(TargetName).lib""
|
||||
CommandLine="SETLOCAL
set DEST=libx64
if not exist %DEST% mkdir %DEST%
copy "$(TargetDir)$(TargetName).lib" "%DEST%\$(TargetName).lib"
"
|
||||
/>
|
||||
</Configuration>
|
||||
<Configuration
|
||||
@ -192,7 +192,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -266,7 +266,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="1"
|
||||
@ -339,7 +339,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
@ -421,7 +421,7 @@
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="2"
|
||||
InlineFunctionExpansion="1"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
|
||||
PreprocessorDefinitions="NDEBUG;WIN32;_LIB"
|
||||
StringPooling="true"
|
||||
RuntimeLibrary="2"
|
||||
@ -501,7 +501,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
|
||||
MinimalRebuild="false"
|
||||
BasicRuntimeChecks="3"
|
||||
@ -584,7 +584,7 @@
|
||||
Name="VCCLCompilerTool"
|
||||
AdditionalOptions="/MP"
|
||||
Optimization="0"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp"
|
||||
AdditionalIncludeDirectories="src;src/phreeqcpp;src/phreeqcpp/PhreeqcKeywords"
|
||||
PreprocessorDefinitions="_DEBUG;WIN32;_LIB"
|
||||
BasicRuntimeChecks="3"
|
||||
RuntimeLibrary="3"
|
||||
@ -993,7 +993,7 @@
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath=".\src\phreeqcpp\Keywords.cpp"
|
||||
RelativePath=".\src\phreeqcpp\PhreeqcKeywords\Keywords.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
|
||||
@ -146,7 +146,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<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>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
@ -182,7 +182,7 @@ copy "$(OutDir)vc100.pdb" "lib\vc100.pdb"
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<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>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
@ -211,7 +211,7 @@ copy "$(OutDir)$(TargetName)$(TargetExt)" "libx64\$(TargetName)$(TargetExt)"</Co
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<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>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@ -246,7 +246,7 @@ copy "$(OutDir)vc100.pdb" "lib\vc100.pdb"</Command>
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<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>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@ -280,7 +280,7 @@ copy "$(OutDir)vc100.pdb" "libx64\vc100.pdb"
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<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>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@ -317,7 +317,7 @@ copy "$(OutDir)$(TargetName).lib" "dll\$(TargetName).lib"
|
||||
<ClCompile>
|
||||
<Optimization>MaxSpeed</Optimization>
|
||||
<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>
|
||||
<StringPooling>true</StringPooling>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
@ -349,7 +349,7 @@ copy "$(OutDir)$(TargetName).lib" "dllx64\$(TargetName).lib"
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugDll|Win32'">
|
||||
<ClCompile>
|
||||
<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>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@ -387,7 +387,7 @@ copy "$(OutDir)vc100.pdb" "dll\vc100.pdb"
|
||||
</Midl>
|
||||
<ClCompile>
|
||||
<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>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
@ -447,6 +447,7 @@ copy "$(OutDir)vc100.pdb" "dllx64\vc100.pdb"
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\IPhreeqc.cpp" />
|
||||
<ClCompile Include="src\IPhreeqcLib.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\PhreeqcKeywords\Keywords.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\SelectedOutput.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\UserPunch.cpp" />
|
||||
<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\ISolution.cxx" />
|
||||
<ClCompile Include="src\phreeqcpp\ISolutionComp.cxx" />
|
||||
<ClCompile Include="src\phreeqcpp\Keywords.cpp" />
|
||||
<ClCompile Include="src\phreeqcpp\KineticsComp.cxx" />
|
||||
<ClCompile Include="src\phreeqcpp\NameDouble.cxx" />
|
||||
<ClCompile Include="src\phreeqcpp\NumKeyword.cxx" />
|
||||
|
||||
@ -59,9 +59,6 @@
|
||||
<ClCompile Include="src\phreeqcpp\ISolutionComp.cxx">
|
||||
<Filter>Source Files\phreeqcpp</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\Keywords.cpp">
|
||||
<Filter>Source Files\phreeqcpp</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\KineticsComp.cxx">
|
||||
<Filter>Source Files\phreeqcpp</Filter>
|
||||
</ClCompile>
|
||||
@ -278,6 +275,9 @@
|
||||
<ClCompile Include="src\phreeqcpp\UserPunch.cpp">
|
||||
<Filter>Source Files\phreeqcpp</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="src\phreeqcpp\PhreeqcKeywords\Keywords.cpp">
|
||||
<Filter>Source Files\phreeqcpp</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="src\CVar.hxx">
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user