[openrtm-commit:02523] r2971 - trunk/OpenRTM-aist/src/lib/rtm/ext
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 15日 (水) 17:45:30 JST
Author: miyamoto
Date: 2017-03-15 17:45:30 +0900 (Wed, 15 Mar 2017)
New Revision: 2971
Modified:
trunk/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml
trunk/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml
Log:
[compat,bugfix,->RELENG_1_2] Modified librtmCamera.vcproj.yaml and librtmManipulator.vcproj.yaml.
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml 2017-03-15 08:01:04 UTC (rev 2970)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml 2017-03-15 08:45:30 UTC (rev 2971)
@@ -15,7 +15,7 @@
#------------------------------------------------------------
- Name: "Debug|Win32"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -73,7 +73,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -133,7 +133,7 @@
copy "$(OutDir)\\rtmCamera$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- Name: "Debug|x64"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -191,7 +191,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -254,7 +254,7 @@
#------------------------------------------------------------
- Name: "Release|Win32"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -309,7 +309,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -365,7 +365,7 @@
copy "$(OutDir)\\rtmCamera$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- Name: "Release|x64"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -420,7 +420,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml 2017-03-15 08:01:04 UTC (rev 2970)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml 2017-03-15 08:45:30 UTC (rev 2971)
@@ -15,7 +15,7 @@
#------------------------------------------------------------
- Name: "Debug|Win32"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -73,7 +73,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -133,7 +133,7 @@
copy "$(OutDir)\\rtmManipulator$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- Name: "Debug|x64"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -191,7 +191,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -254,7 +254,7 @@
#------------------------------------------------------------
- Name: "Release|Win32"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -309,7 +309,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -365,7 +365,7 @@
copy "$(OutDir)\\rtmManipulator$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- Name: "Release|x64"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
+ IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -420,7 +420,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
+ VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
openrtm-commit メーリングリストの案内