Skip to content

Commit eaba00d

Browse files
authored
Merge pull request dtarb#88 from dtarb/70-FlowDirCond
Flow dir cond
2 parents 5b1b889 + 448ff27 commit eaba00d

File tree

6 files changed

+566
-3
lines changed

6 files changed

+566
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,146 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Debug|Win32">
5+
<Configuration>Debug</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
<ProjectConfiguration Include="Debug|x64">
9+
<Configuration>Debug</Configuration>
10+
<Platform>x64</Platform>
11+
</ProjectConfiguration>
12+
<ProjectConfiguration Include="Release|Win32">
13+
<Configuration>Release</Configuration>
14+
<Platform>Win32</Platform>
15+
</ProjectConfiguration>
16+
<ProjectConfiguration Include="Release|x64">
17+
<Configuration>Release</Configuration>
18+
<Platform>x64</Platform>
19+
</ProjectConfiguration>
20+
</ItemGroup>
21+
<ItemGroup>
22+
<ClCompile Include="..\..\src\commonLib.cpp" />
23+
<ClCompile Include="..\..\src\flowdircond.cpp" />
24+
<ClCompile Include="..\..\src\flowdirconditionmn.cpp" />
25+
<ClCompile Include="..\..\src\tiffIO.cpp" />
26+
</ItemGroup>
27+
<PropertyGroup Label="Globals">
28+
<ProjectGuid>{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}</ProjectGuid>
29+
<Keyword>Win32Proj</Keyword>
30+
<RootNamespace>FlowdirCond</RootNamespace>
31+
</PropertyGroup>
32+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
33+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
34+
<ConfigurationType>Application</ConfigurationType>
35+
<UseDebugLibraries>true</UseDebugLibraries>
36+
<CharacterSet>Unicode</CharacterSet>
37+
<PlatformToolset>v140</PlatformToolset>
38+
</PropertyGroup>
39+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
40+
<ConfigurationType>Application</ConfigurationType>
41+
<UseDebugLibraries>true</UseDebugLibraries>
42+
<CharacterSet>Unicode</CharacterSet>
43+
<PlatformToolset>v140</PlatformToolset>
44+
</PropertyGroup>
45+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
46+
<ConfigurationType>Application</ConfigurationType>
47+
<UseDebugLibraries>false</UseDebugLibraries>
48+
<WholeProgramOptimization>true</WholeProgramOptimization>
49+
<CharacterSet>Unicode</CharacterSet>
50+
<PlatformToolset>v140</PlatformToolset>
51+
</PropertyGroup>
52+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
53+
<ConfigurationType>Application</ConfigurationType>
54+
<UseDebugLibraries>false</UseDebugLibraries>
55+
<WholeProgramOptimization>true</WholeProgramOptimization>
56+
<CharacterSet>Unicode</CharacterSet>
57+
<PlatformToolset>v140</PlatformToolset>
58+
</PropertyGroup>
59+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
60+
<ImportGroup Label="ExtensionSettings">
61+
</ImportGroup>
62+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
63+
<Import Project="..\TauDEM_Build_Configurations\common_debug_32.props" />
64+
<Import Project="..\TauDEM_Build_Configurations\win32_library.props" />
65+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
66+
</ImportGroup>
67+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
68+
<Import Project="..\TauDEM_Build_Configurations\common_debug_64.props" />
69+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
70+
</ImportGroup>
71+
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
72+
<Import Project="..\TauDEM_Build_Configurations\common_release_32.props" />
73+
<Import Project="..\TauDEM_Build_Configurations\win32_library.props" />
74+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
75+
</ImportGroup>
76+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
77+
<Import Project="..\TauDEM_Build_Configurations\common_release_64.props" />
78+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
79+
</ImportGroup>
80+
<PropertyGroup Label="UserMacros" />
81+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
82+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
83+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
84+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
85+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
86+
<ClCompile>
87+
<PrecompiledHeader>
88+
</PrecompiledHeader>
89+
<Optimization>Disabled</Optimization>
90+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
91+
</ClCompile>
92+
<Link>
93+
<SubSystem>Console</SubSystem>
94+
<GenerateDebugInformation>true</GenerateDebugInformation>
95+
</Link>
96+
</ItemDefinitionGroup>
97+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
98+
<ClCompile>
99+
<PrecompiledHeader>
100+
</PrecompiledHeader>
101+
<Optimization>Disabled</Optimization>
102+
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
103+
</ClCompile>
104+
<Link>
105+
<SubSystem>Console</SubSystem>
106+
<GenerateDebugInformation>true</GenerateDebugInformation>
107+
<AdditionalDependencies>gdal_i.lib;msmpi.lib;%(AdditionalDependencies)</AdditionalDependencies>
108+
</Link>
109+
</ItemDefinitionGroup>
110+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
111+
<ClCompile>
112+
<PrecompiledHeader>
113+
</PrecompiledHeader>
114+
<Optimization>MaxSpeed</Optimization>
115+
<FunctionLevelLinking>true</FunctionLevelLinking>
116+
<IntrinsicFunctions>true</IntrinsicFunctions>
117+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
118+
</ClCompile>
119+
<Link>
120+
<SubSystem>Console</SubSystem>
121+
<GenerateDebugInformation>true</GenerateDebugInformation>
122+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
123+
<OptimizeReferences>true</OptimizeReferences>
124+
</Link>
125+
</ItemDefinitionGroup>
126+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
127+
<ClCompile>
128+
<PrecompiledHeader>
129+
</PrecompiledHeader>
130+
<Optimization>MaxSpeed</Optimization>
131+
<FunctionLevelLinking>true</FunctionLevelLinking>
132+
<IntrinsicFunctions>true</IntrinsicFunctions>
133+
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
134+
</ClCompile>
135+
<Link>
136+
<SubSystem>Console</SubSystem>
137+
<GenerateDebugInformation>true</GenerateDebugInformation>
138+
<EnableCOMDATFolding>true</EnableCOMDATFolding>
139+
<OptimizeReferences>true</OptimizeReferences>
140+
<AdditionalDependencies>gdal_i.lib;msmpi.lib;%(AdditionalDependencies)</AdditionalDependencies>
141+
</Link>
142+
</ItemDefinitionGroup>
143+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
144+
<ImportGroup Label="ExtensionTargets">
145+
</ImportGroup>
146+
</Project>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Common">
5+
<UniqueIdentifier>{157053b2-c7d2-4a18-bb54-e7ce30ad0a2b}</UniqueIdentifier>
6+
</Filter>
7+
</ItemGroup>
8+
<ItemGroup>
9+
<ClCompile Include="..\..\src\tiffIO.cpp">
10+
<Filter>Common</Filter>
11+
</ClCompile>
12+
<ClCompile Include="..\..\src\commonLib.cpp">
13+
<Filter>Common</Filter>
14+
</ClCompile>
15+
<ClCompile Include="..\..\src\flowdircond.cpp" />
16+
<ClCompile Include="..\..\src\flowdirconditionmn.cpp" />
17+
</ItemGroup>
18+
</Project>

Taudem5PCVS2015/Taudem5PC.sln

+12
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogrtest", "ogrtest\ogrtest.
6363
EndProject
6464
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SinmapSI", "SinmapSI\SinmapSI.vcxproj", "{4C94C630-FAFC-4EC9-8639-336E6FD7A85C}"
6565
EndProject
66+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FlowdirCond", "FlowdirCond\FlowdirCond.vcxproj", "{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}"
67+
EndProject
6668
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B14788A2-B826-401F-A9AB-D84B1ED3D278}"
6769
EndProject
6870
Global
@@ -374,6 +376,16 @@ Global
374376
{4C94C630-FAFC-4EC9-8639-336E6FD7A85C}.Release|Win32.Build.0 = Release|Win32
375377
{4C94C630-FAFC-4EC9-8639-336E6FD7A85C}.Release|x64.ActiveCfg = Release|x64
376378
{4C94C630-FAFC-4EC9-8639-336E6FD7A85C}.Release|x64.Build.0 = Release|x64
379+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Debug|Itanium.ActiveCfg = Debug|Win32
380+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Debug|Win32.ActiveCfg = Debug|Win32
381+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Debug|Win32.Build.0 = Debug|Win32
382+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Debug|x64.ActiveCfg = Debug|x64
383+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Debug|x64.Build.0 = Debug|x64
384+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Release|Itanium.ActiveCfg = Release|Win32
385+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Release|Win32.ActiveCfg = Release|Win32
386+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Release|Win32.Build.0 = Release|Win32
387+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Release|x64.ActiveCfg = Release|x64
388+
{0799D1C7-57FD-4CBB-BEB0-65477E9E8B86}.Release|x64.Build.0 = Release|x64
377389
EndGlobalSection
378390
GlobalSection(SolutionProperties) = preSolution
379391
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)