Changeset 32515

Show
Ignore:
Timestamp:
04/17/09 07:49:09 (4 years ago)
Author:
schima
Message:

changed setting of manifest

Location:
lang/cpluspluscli/OpenCvSharp2/trunk
Files:
8 modified

Legend:

Unmodified
Added
Removed

  • lang/cpluspluscli/OpenCvSharp2/trunk

    • Property svn:ignore

      •  

        old new  
        1313Matt H 
        1414_ReSharper.OpenCvSharp 
         15Help JP 

  • lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Blob/OpenCvSharp.Blob.vcproj

    r32110 r32515  
    6565                                LinkIncremental="2" 
    6666                                AdditionalLibraryDirectories=""D:\logiciels\OpenCV\lib"" 
     67                                AdditionalManifestDependencies="type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'" 
    6768                                GenerateDebugInformation="true" 
    6869                                AssemblyDebug="1" 
    … …  
    139140                                LinkIncremental="1" 
    140141                                AdditionalLibraryDirectories=""C:\Program Files\OpenCV\lib"" 
     142                                AdditionalManifestDependencies="type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'" 
    141143                                GenerateDebugInformation="true" 
    142144                                TargetMachine="1" 
    … …  
    212214                                LinkIncremental="2" 
    213215                                AdditionalLibraryDirectories=""D:\logiciels\OpenCV\lib"" 
     216                                AdditionalManifestDependencies="type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'" 
    214217                                GenerateDebugInformation="true" 
    215218                                AssemblyDebug="1" 

  • lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Extern/OpenCvSharp.Extern.vcproj

    r32511 r32515  
    6565                                LinkIncremental="2" 
    6666                                AdditionalLibraryDirectories="" 
     67                                AdditionalManifestDependencies="type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'" 
    6768                                GenerateDebugInformation="true" 
    6869                                AssemblyDebug="1" 
    … …  
    138139                                LinkIncremental="1" 
    139140                                AdditionalLibraryDirectories=""C:\Program Files\OpenCV\lib"" 
     141                                AdditionalManifestDependencies="type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'" 
    140142                                GenerateDebugInformation="true" 
    141143                                TargetMachine="1" 
    … …  
    211213                                LinkIncremental="2" 
    212214                                AdditionalLibraryDirectories=""D:\logiciels\OpenCV\lib"" 
     215                                AdditionalManifestDependencies="type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'" 
    213216                                GenerateDebugInformation="true" 
    214217                                AssemblyDebug="1" 
    … …  
    284287                                LinkIncremental="1" 
    285288                                AdditionalLibraryDirectories=""C:\Program Files\OpenCV\lib"" 
     289                                AdditionalManifestDependencies="type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'" 
    286290                                GenerateDebugInformation="true" 
    287291                                TargetMachine="1" 
    … …  
    356360                                LinkIncremental="1" 
    357361                                AdditionalLibraryDirectories=""C:\Program Files\OpenCV\lib"" 
     362                                AdditionalManifestDependencies="type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'" 
    358363                                GenerateDebugInformation="true" 
    359364                                TargetMachine="1" 
    … …  
    428433                                LinkIncremental="1" 
    429434                                AdditionalLibraryDirectories=""C:\Program Files\OpenCV\lib"" 
     435                                AdditionalManifestDependencies="type='win32' name='Microsoft.VC90.CRT' version='9.0.21022.8' processorArchitecture='x86' publicKeyToken='1fc8b3b9a1e18e3b'" 
    430436                                GenerateDebugInformation="true" 
    431437                                TargetMachine="1" 

  • lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/OpenCvSharp.Test.csproj

    r32359 r32515  
    153153    <Compile Include="Samples\CalibrateCamera.cs" /> 
    154154    <Compile Include="Samples\CaptureAVI.cs" /> 
    155     <Compile Include="Samples\CaptureCamera.cs" /> 
     155    <Compile Include="Samples\CaptureCamera.cs"> 
     156    </Compile> 
    156157    <Compile Include="Samples\Contour.cs" /> 
    157158    <Compile Include="Samples\ContourScanner.cs" /> 
    … …  
    312313      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
    313314    </Content> 
     315    <Content Include="msvcm90.dll"> 
     316      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
     317    </Content> 
     318    <Content Include="msvcp90.dll"> 
     319      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
     320    </Content> 
     321    <Content Include="msvcr90.dll"> 
     322      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> 
     323    </Content> 
    314324  </ItemGroup> 
    315325  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 

  • lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp.Test/Samples/CaptureCamera.cs

    r32427 r32515  
    1010    /// </summary> 
    1111    class CaptureCamera 
    12     {         
     12    { 
    1313        public CaptureCamera() 
    1414        { 

  • lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp/ReadMe.txt

    r32414 r32515  
     1===== Usage ===== 
     2Essential files : OpenCvSharp.dll 
     3                  OpenCvSharp.Extern.dll 
     4Optional files  : OpenCvSharp.MachineLearning.dll 
     5                  OpenCvSharp.Blob.dll 
     6              
     7Add reference to these dll files. 
     8 
     9These files needs VC++9.0 runtime, so you should add reference to msvcr90.dll, msvcp90.dll, .... 
     10 
    111===== Version ===== 
    2121.1pre 
    313 
    414===== Description ===== 
     15This is a wrapper in order to use OpenCV on .NET Framework. 
     16 
    517OpenCV (http://opencv.jp/opencv_org/docs/index.htm) ��T Framework���痘�p���邽�߂̃��b�p�[�ł��B 
    618OpenCV�̃o�[�W�����́AOpenCvSharp�Ɠ����ԍ��̃o�[�W�������K�v�ł��B 

  • lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp_EN.shfbproj

    r31827 r32515  
    2323    <Language>en-US</Language> 
    2424    <DocumentationSources> 
    25       <DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.dll" /> 
    26       <DocumentationSource sourceFile="Release\OpenCvSharp.Extern.dll" /> 
    27       <DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" /> 
    28       <DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.xml" /> 
    29       <DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.xml" /> 
    30     </DocumentationSources> 
     25      <DocumentationSource sourceFile="Release\OpenCvSharp.Blob.dll" /> 
     26<DocumentationSource sourceFile="Release\OpenCvSharp.Blob.xml" /> 
     27<DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.dll" /> 
     28<DocumentationSource sourceFile="Release\OpenCvSharp.Extern.dll" /> 
     29<DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.dll" /> 
     30<DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.MachineLearning.xml" /> 
     31<DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release\OpenCvSharp.xml" /></DocumentationSources> 
    3132  </PropertyGroup> 
    3233  <!-- There are no properties for these two groups but they need to appear in 

  • lang/cpluspluscli/OpenCvSharp2/trunk/OpenCvSharp_JP.shfbproj

    r31945 r32515  
    1818    <HtmlHelpName>Documentation</HtmlHelpName> 
    1919    <FrameworkVersion>3.5</FrameworkVersion> 
    20     <HelpFileFormat>HtmlHelp1x</HelpFileFormat> 
     20    <HelpFileFormat>Help1xAndWebsite</HelpFileFormat> 
    2121    <ProjectSummary>A wrapper of OpenCV for .NET Framework</ProjectSummary> 
    2222    <HelpTitle>OpenCvSharp Class Library</HelpTitle> 
    2323    <Language>ja-JP</Language> 
    2424    <DocumentationSources> 
    25       <DocumentationSource sourceFile="OpenCvSharp\bin\Release JA\OpenCvSharp.dll" xmlns="" /> 
    26       <DocumentationSource sourceFile="Release JA\OpenCvSharp.Extern.dll" xmlns="" /> 
    27       <DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release JA\OpenCvSharp.MachineLearning.dll" xmlns="" /> 
    28       <DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release JA\OpenCvSharp.MachineLearning.xml" xmlns="" /> 
    29       <DocumentationSource sourceFile="OpenCvSharp\bin\Release JA\OpenCvSharp.xml" xmlns="" /> 
    30     </DocumentationSources> 
     25      <DocumentationSource sourceFile="Release\OpenCvSharp.Blob.dll" /> 
     26<DocumentationSource sourceFile="Release\OpenCvSharp.Blob.xml" /> 
     27<DocumentationSource sourceFile="OpenCvSharp\bin\Release JP\OpenCvSharp.dll" /> 
     28<DocumentationSource sourceFile="Release JP\OpenCvSharp.Extern.dll" /> 
     29<DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release JA\OpenCvSharp.MachineLearning.dll" /> 
     30<DocumentationSource sourceFile="OpenCvSharp.MachineLearning\bin\Release JA\OpenCvSharp.MachineLearning.xml" /> 
     31<DocumentationSource sourceFile="OpenCvSharp\bin\Release JP\OpenCvSharp.XML" /></DocumentationSources> 
    3132  </PropertyGroup> 
    3233  <!-- There are no properties for these two groups but they need to appear in