[openrtm-commit:00132] r33 - trunk/ImageProcessing/opencv/components/IEEE1394Camera
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2011年 5月 29日 (日) 11:21:46 JST
Author: n-ando
Date: 2011-05-29 11:21:46 +0900 (Sun, 29 May 2011)
New Revision: 33
Modified:
trunk/ImageProcessing/opencv/components/IEEE1394Camera/baseclasses_vc8.vcproj
trunk/ImageProcessing/opencv/components/IEEE1394Camera/baseclasses_vc9.vcproj
Log:
lib name changed. strmbasd.lib -> strmbased.lib
Modified: trunk/ImageProcessing/opencv/components/IEEE1394Camera/baseclasses_vc8.vcproj
===================================================================
--- trunk/ImageProcessing/opencv/components/IEEE1394Camera/baseclasses_vc8.vcproj 2011-05-29 02:04:10 UTC (rev 32)
+++ trunk/ImageProcessing/opencv/components/IEEE1394Camera/baseclasses_vc8.vcproj 2011-05-29 02:21:46 UTC (rev 33)
@@ -64,7 +64,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbasd.lib"
+ OutputFile="$(OutDir)\strmbased.lib"
AdditionalLibraryDirectories=""
/>
<Tool
@@ -191,7 +191,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbasd.lib"
+ OutputFile="$(OutDir)\strmbased.lib"
AdditionalLibraryDirectories=""
/>
<Tool
@@ -319,7 +319,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbasd.lib"
+ OutputFile="$(OutDir)\strmbased.lib"
AdditionalLibraryDirectories=""
/>
<Tool
@@ -448,7 +448,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbasd.lib"
+ OutputFile="$(OutDir)\strmbased.lib"
AdditionalLibraryDirectories=""
/>
<Tool
Modified: trunk/ImageProcessing/opencv/components/IEEE1394Camera/baseclasses_vc9.vcproj
===================================================================
--- trunk/ImageProcessing/opencv/components/IEEE1394Camera/baseclasses_vc9.vcproj 2011-05-29 02:04:10 UTC (rev 32)
+++ trunk/ImageProcessing/opencv/components/IEEE1394Camera/baseclasses_vc9.vcproj 2011-05-29 02:21:46 UTC (rev 33)
@@ -66,7 +66,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbasd.lib"
+ OutputFile="$(OutDir)\strmbased.lib"
AdditionalLibraryDirectories=""
/>
<Tool
@@ -86,9 +86,9 @@
/>
</Configuration>
<Configuration
- Name="Debug|x64"
- OutputDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
+ Name="Release|Win32"
+ OutputDirectory="baseclass\$(ConfigurationName)"
+ IntermediateDirectory="baseclass\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
CharacterSet="1"
@@ -107,16 +107,13 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -133,8 +130,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbasd.lib"
- AdditionalLibraryDirectories=""
+ OutputFile="$(OutDir)\strmbase.lib"
/>
<Tool
Name="VCALinkTool"
@@ -153,12 +149,12 @@
/>
</Configuration>
<Configuration
- Name="Release|Win32"
+ Name="Debug_MBCS|Win32"
OutputDirectory="baseclass\$(ConfigurationName)"
IntermediateDirectory="baseclass\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -177,13 +173,15 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
+ Optimization="0"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="3"
+ DebugInformationFormat="4"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -197,7 +195,8 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbase.lib"
+ OutputFile="$(OutDir)\strmbased.lib"
+ AdditionalLibraryDirectories=""
/>
<Tool
Name="VCALinkTool"
@@ -216,12 +215,12 @@
/>
</Configuration>
<Configuration
- Name="Release|x64"
- OutputDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
- IntermediateDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
+ Name="Release_MBCS|Win32"
+ OutputDirectory="baseclass\$(ConfigurationName)"
+ IntermediateDirectory="baseclass\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- CharacterSet="1"
+ CharacterSet="2"
>
<Tool
Name="VCPreBuildEventTool"
@@ -237,7 +236,6 @@
/>
<Tool
Name="VCMIDLTool"
- TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
@@ -280,12 +278,12 @@
/>
</Configuration>
<Configuration
- Name="Debug_MBCS|Win32"
- OutputDirectory="baseclass\$(ConfigurationName)"
- IntermediateDirectory="baseclass\$(ConfigurationName)"
+ Name="Debug|x64"
+ OutputDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -301,6 +299,7 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
@@ -312,7 +311,7 @@
RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- DebugInformationFormat="4"
+ DebugInformationFormat="3"
/>
<Tool
Name="VCManagedResourceCompilerTool"
@@ -326,7 +325,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbasd.lib"
+ OutputFile="$(OutDir)\strmbased.lib"
AdditionalLibraryDirectories=""
/>
<Tool
@@ -346,12 +345,12 @@
/>
</Configuration>
<Configuration
- Name="Debug_MBCS|x64"
+ Name="Release|x64"
OutputDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
IntermediateDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
- CharacterSet="2"
+ CharacterSet="1"
>
<Tool
Name="VCPreBuildEventTool"
@@ -371,12 +370,10 @@
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="0"
+ Optimization="2"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
- MinimalRebuild="true"
- BasicRuntimeChecks="3"
- RuntimeLibrary="3"
+ PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -393,8 +390,7 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbasd.lib"
- AdditionalLibraryDirectories=""
+ OutputFile="$(OutDir)\strmbase.lib"
/>
<Tool
Name="VCALinkTool"
@@ -413,9 +409,9 @@
/>
</Configuration>
<Configuration
- Name="Release_MBCS|Win32"
- OutputDirectory="baseclass\$(ConfigurationName)"
- IntermediateDirectory="baseclass\$(ConfigurationName)"
+ Name="Debug_MBCS|x64"
+ OutputDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
+ IntermediateDirectory="baseclass\$(PlatformName)\$(ConfigurationName)"
ConfigurationType="4"
InheritedPropertySheets="$(SolutionDir)rtm_config.vsprops;$(SolutionDir)user_config.vsprops"
CharacterSet="2"
@@ -434,13 +430,16 @@
/>
<Tool
Name="VCMIDLTool"
+ TargetEnvironment="3"
/>
<Tool
Name="VCCLCompilerTool"
- Optimization="2"
+ Optimization="0"
AdditionalIncludeDirectories="."
- PreprocessorDefinitions="WIN32;NDEBUG;_LIB;"
- RuntimeLibrary="2"
+ PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
+ MinimalRebuild="true"
+ BasicRuntimeChecks="3"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -457,7 +456,8 @@
<Tool
Name="VCLibrarianTool"
AdditionalDependencies="strmiids.lib"
- OutputFile="$(OutDir)\strmbase.lib"
+ OutputFile="$(OutDir)\strmbased.lib"
+ AdditionalLibraryDirectories=""
/>
<Tool
Name="VCALinkTool"
openrtm-commit メーリングリストの案内