Mercurial Hosting > traffic-intelligence
changeset 709:29daabe094fe dev
merged from stable
author | Nicolas Saunier <nicolas.saunier@polymtl.ca> |
---|---|
date | Wed, 22 Jul 2015 14:18:06 -0400 |
parents | e395bffe1412 (current diff) a37c565f4b68 (diff) |
children | a05f79c74d6d |
files | |
diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/trafficintelligence.vcxproj Wed Jul 22 14:15:33 2015 -0400 +++ b/trafficintelligence.vcxproj Wed Jul 22 14:18:06 2015 -0400 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -14,8 +14,6 @@ <ClCompile Include="..\trajectorymanagementandanalysis\trunk\src\TrajectoryManagementAndAnalysis\src\DBSQLiteAccess.cpp" /> <ClCompile Include="c\cvutils.cpp" /> <ClCompile Include="c\feature-based-tracking.cpp" /> - <ClCompile Include="c\InputFrameListModule.cpp" /> - <ClCompile Include="c\InputVideoFileModule.cpp" /> <ClCompile Include="c\Motion.cpp" /> <ClCompile Include="c\Parameters.cpp" /> <ClCompile Include="c\utils.cpp" /> @@ -23,13 +21,14 @@ <ItemGroup> <ClInclude Include="include\catch.hpp" /> <ClInclude Include="include\cvutils.hpp" /> - <ClInclude Include="include\InputFrameListModule.h" /> - <ClInclude Include="include\InputFrameProviderIface.h" /> - <ClInclude Include="include\InputVideoFileModule.h" /> <ClInclude Include="include\learning.hpp" /> <ClInclude Include="include\Motion.hpp" /> <ClInclude Include="include\Parameters.hpp" /> <ClInclude Include="include\utils.hpp" /> + <ClInclude Include="resource.h" /> + </ItemGroup> + <ItemGroup> + <ResourceCompile Include="trafficintelligence.rc" /> </ItemGroup> <PropertyGroup Label="Globals"> <ProjectGuid>{70E43B7B-A3DA-40AD-A0D3-24758BA3FC42}</ProjectGuid> @@ -41,12 +40,14 @@ <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>Application</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> + <PlatformToolset>v120</PlatformToolset> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <ImportGroup Label="ExtensionSettings">