-
Notifications
You must be signed in to change notification settings - Fork 116
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #109 from dtarb/Develop
Version 5.3.8
- Loading branch information
Showing
17 changed files
with
2,013 additions
and
428 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,185 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup Label="ProjectConfigurations"> | ||
| <ProjectConfiguration Include="Debug|Win32"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|Win32"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>Win32</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Debug|x64"> | ||
| <Configuration>Debug</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| <ProjectConfiguration Include="Release|x64"> | ||
| <Configuration>Release</Configuration> | ||
| <Platform>x64</Platform> | ||
| </ProjectConfiguration> | ||
| </ItemGroup> | ||
| <PropertyGroup Label="Globals"> | ||
| <ProjectGuid>{B5AE0370-CE03-4A89-9063-B65491EF7C67}</ProjectGuid> | ||
| <RootNamespace>CatchOutlets</RootNamespace> | ||
| <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| <ConfigurationType>Application</ConfigurationType> | ||
| <CharacterSet>Unicode</CharacterSet> | ||
| <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| <ConfigurationType>Application</ConfigurationType> | ||
| <CharacterSet>Unicode</CharacterSet> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| <ConfigurationType>Application</ConfigurationType> | ||
| <CharacterSet>Unicode</CharacterSet> | ||
| <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| </PropertyGroup> | ||
| <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| <ConfigurationType>Application</ConfigurationType> | ||
| <CharacterSet>Unicode</CharacterSet> | ||
| <PlatformToolset>v140</PlatformToolset> | ||
| </PropertyGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| <ImportGroup Label="ExtensionSettings"> | ||
| </ImportGroup> | ||
| <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | ||
| <Import Project="..\TauDEM_Build_Configurations\common_release_32.props" /> | ||
| <Import Project="..\TauDEM_Build_Configurations\win32_library.props" /> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | ||
| <Import Project="..\TauDEM_Build_Configurations\common_debug_32.props" /> | ||
| <Import Project="..\TauDEM_Build_Configurations\win32_library.props" /> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| <Import Project="..\TauDEM_Build_Configurations\common_release_64.props" /> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
| <Import Project="..\TauDEM_Build_Configurations\common_debug_64.props" /> | ||
| <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| </ImportGroup> | ||
| <PropertyGroup Label="UserMacros" /> | ||
| <PropertyGroup> | ||
| <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | ||
| <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir> | ||
| <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir> | ||
| <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> | ||
| <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\</IntDir> | ||
| <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir> | ||
| <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> | ||
| <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Platform)\$(Configuration)\</OutDir> | ||
| <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\</IntDir> | ||
| <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| </PropertyGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| <ClCompile> | ||
| <Optimization>Disabled</Optimization> | ||
| <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <MinimalRebuild>true</MinimalRebuild> | ||
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| <PrecompiledHeader> | ||
| </PrecompiledHeader> | ||
| </ClCompile> | ||
| <Link> | ||
| <AdditionalDependencies>msmpi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <SubSystem>Console</SubSystem> | ||
| <TargetMachine>MachineX86</TargetMachine> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| <Midl> | ||
| <TargetEnvironment>X64</TargetEnvironment> | ||
| </Midl> | ||
| <ClCompile> | ||
| <Optimization>Disabled</Optimization> | ||
| <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <MinimalRebuild>true</MinimalRebuild> | ||
| <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> | ||
| <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| <PrecompiledHeader> | ||
| </PrecompiledHeader> | ||
| </ClCompile> | ||
| <Link> | ||
| <AdditionalDependencies>gdal_i.lib;msmpi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <SubSystem>Console</SubSystem> | ||
| <TargetMachine>MachineX64</TargetMachine> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| <ClCompile> | ||
| <Optimization>MaxSpeed</Optimization> | ||
| <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| <PrecompiledHeader> | ||
| </PrecompiledHeader> | ||
| </ClCompile> | ||
| <Link> | ||
| <AdditionalDependencies>msmpi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <SubSystem>Console</SubSystem> | ||
| <OptimizeReferences>true</OptimizeReferences> | ||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| <TargetMachine>MachineX86</TargetMachine> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| <Midl> | ||
| <TargetEnvironment>X64</TargetEnvironment> | ||
| </Midl> | ||
| <ClCompile> | ||
| <Optimization>MaxSpeed</Optimization> | ||
| <IntrinsicFunctions>true</IntrinsicFunctions> | ||
| <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| <PrecompiledHeader> | ||
| </PrecompiledHeader> | ||
| </ClCompile> | ||
| <Link> | ||
| <AdditionalDependencies>gdal_i.lib;msmpi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| <SubSystem>Console</SubSystem> | ||
| <OptimizeReferences>true</OptimizeReferences> | ||
| <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| <TargetMachine>MachineX64</TargetMachine> | ||
| </Link> | ||
| </ItemDefinitionGroup> | ||
| <ItemGroup> | ||
| <ClCompile Include="..\..\src\CatchOutlets.cpp" /> | ||
| <ClCompile Include="..\..\src\CatchOutletsmn.cpp" /> | ||
| <ClCompile Include="..\..\src\commonLib.cpp" /> | ||
| <ClCompile Include="..\..\src\ReadOutlets.cpp" /> | ||
| <ClCompile Include="..\..\src\tiffIO.cpp" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ResourceCompile Include="..\TauDEM.rc" /> | ||
| </ItemGroup> | ||
| <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| <ImportGroup Label="ExtensionTargets"> | ||
| </ImportGroup> | ||
| </Project> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| <ItemGroup> | ||
| <ClCompile Include="..\..\src\commonLib.cpp"> | ||
| <Filter>Common</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="..\..\src\tiffIO.cpp"> | ||
| <Filter>Common</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="..\..\src\ReadOutlets.cpp"> | ||
| <Filter>Common</Filter> | ||
| </ClCompile> | ||
| <ClCompile Include="..\..\src\CatchOutlets.cpp" /> | ||
| <ClCompile Include="..\..\src\CatchOutletsmn.cpp" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <ResourceCompile Include="..\TauDEM.rc" /> | ||
| </ItemGroup> | ||
| <ItemGroup> | ||
| <Filter Include="Common"> | ||
| <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier> | ||
| </Filter> | ||
| </ItemGroup> | ||
| </Project> |
Oops, something went wrong.