[openrtm-commit:02520] r2968 - trunk/OpenRTM-aist/src/lib/rtm/ext
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 15日 (水) 15:35:18 JST
Author: miyamoto
Date: 2017-03-15 15:35:17 +0900 (Wed, 15 Mar 2017)
New Revision: 2968
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 05:15:41 UTC (rev 2967)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml 2017-03-15 06:35:17 UTC (rev 2968)
@@ -14,7 +14,7 @@
# Debug Configuration
#------------------------------------------------------------
- Name: "Debug|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
@@ -72,7 +72,7 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
@@ -132,7 +132,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\rtmCamera$(rtm_dllver)d.lib"
copy "$(OutDir)\\rtmCamera$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- Name: "Debug|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
@@ -190,7 +190,7 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
@@ -253,7 +253,7 @@
# Release Configuration
#------------------------------------------------------------
- Name: "Release|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
@@ -308,7 +308,7 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
@@ -364,7 +364,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\rtmCamera$(rtm_dllver).lib"
copy "$(OutDir)\\rtmCamera$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- Name: "Release|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
@@ -419,7 +419,7 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.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 05:15:41 UTC (rev 2967)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml 2017-03-15 06:35:17 UTC (rev 2968)
@@ -14,7 +14,7 @@
# Debug Configuration
#------------------------------------------------------------
- Name: "Debug|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
@@ -72,7 +72,7 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
@@ -132,7 +132,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\rtmManipulator$(rtm_dllver)d.lib"
copy "$(OutDir)\\rtmManipulator$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- Name: "Debug|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
@@ -190,7 +190,7 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
@@ -253,7 +253,7 @@
# Release Configuration
#------------------------------------------------------------
- Name: "Release|Win32"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
@@ -308,7 +308,7 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
@@ -364,7 +364,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\rtmManipulator$(rtm_dllver).lib"
copy "$(OutDir)\\rtmManipulator$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- Name: "Release|x64"
- OutputDirectory: "$(ProjectDir)$(ConfigurationName)"
+ OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
IntermediateDirectory: "$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
@@ -419,7 +419,7 @@
Value: |
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
- VC10_OutputDirectory: "$(ProjectDir)$(Configuration)"
+ VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
VC10_IntermediateDirectory: "$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
openrtm-commit メーリングリストの案内