[openrtm-commit:02521] r2969 - trunk/OpenRTM-aist/src/lib/rtm/ext
openrtm ＠ openrtm.org
openrtm ＠ openrtm.org
2017年 3月 15日 (水) 16:06:47 JST
Author: miyamoto
Date: 2017-03-15 16:06:46 +0900 (Wed, 15 Mar 2017)
New Revision: 2969
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 06:35:17 UTC (rev 2968)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/librtmCamera.vcproj.yaml 2017-03-15 07:06:46 UTC (rev 2969)
@@ -15,7 +15,7 @@
#------------------------------------------------------------
- Name: "Debug|Win32"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -49,7 +49,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver)d $(rtm_shortver) rtmCamera$(rtm_dllver)d.def
- move rtmCamera$(rtm_dllver)d.def ..\
+ move rtmCamera$(rtm_dllver)d.def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib $(rtm_depend_libd)"
@@ -73,7 +73,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -108,7 +108,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver)d $(rtm_shortver) rtmCamera$(rtm_dllver)d.def
- move rtmCamera$(rtm_dllver)d.def ..\
+ move rtmCamera$(rtm_dllver)d.def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
@@ -133,7 +133,7 @@
copy "$(OutDir)\\rtmCamera$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- Name: "Debug|x64"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -167,7 +167,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver)d $(rtm_shortver) rtmCamera$(rtm_dllver)d.def
- move rtmCamera$(rtm_dllver)d.def ..\
+ move rtmCamera$(rtm_dllver)d.def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib $(rtm_depend_libd)"
@@ -191,7 +191,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -226,7 +226,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver)d $(rtm_shortver) rtmCamera$(rtm_dllver)d.def
- move rtmCamera$(rtm_dllver)d.def ..\
+ move rtmCamera$(rtm_dllver)d.def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
@@ -254,7 +254,7 @@
#------------------------------------------------------------
- Name: "Release|Win32"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -283,7 +283,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move rtmCamera$(rtm_dllver).def ..\\
+ move rtmCamera$(rtm_dllver).def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib $(rtm_depend_lib)"
@@ -309,7 +309,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -338,7 +338,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver) $(rtm_shortver) rtmCamera$(rtm_dllver).def
- move rtmCamera$(rtm_dllver).def ..\\
+ move rtmCamera$(rtm_dllver).def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
@@ -365,7 +365,7 @@
copy "$(OutDir)\\rtmCamera$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- Name: "Release|x64"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -394,7 +394,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move rtmCamera$(rtm_dllver).def ..\\
+ move rtmCamera$(rtm_dllver).def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib $(rtm_depend_lib)"
@@ -420,7 +420,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -449,7 +449,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmCamera_static.lib rtmCamera$(rtm_dllver) $(rtm_shortver) rtmCamera$(rtm_dllver).def
- move rtmCamera$(rtm_dllver).def ..\\
+ move rtmCamera$(rtm_dllver).def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
Modified: trunk/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml
===================================================================
--- trunk/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml 2017-03-15 06:35:17 UTC (rev 2968)
+++ trunk/OpenRTM-aist/src/lib/rtm/ext/librtmManipulator.vcproj.yaml 2017-03-15 07:06:46 UTC (rev 2969)
@@ -15,7 +15,7 @@
#------------------------------------------------------------
- Name: "Debug|Win32"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -49,7 +49,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver)d $(rtm_shortver) rtmManipulator$(rtm_dllver)d.def
- move rtmManipulator$(rtm_dllver)d.def ..\
+ move rtmManipulator$(rtm_dllver)d.def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib $(rtm_depend_libd)"
@@ -73,7 +73,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -108,7 +108,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver)d $(rtm_shortver) rtmManipulator$(rtm_dllver)d.def
- move rtmManipulator$(rtm_dllver)d.def ..\
+ move rtmManipulator$(rtm_dllver)d.def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
@@ -133,7 +133,7 @@
copy "$(OutDir)\\rtmManipulator$(rtm_dllver)d.dll" "$(SolutionDir)bin\\"
- Name: "Debug|x64"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -167,7 +167,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver)d $(rtm_shortver) rtmManipulator$(rtm_dllver)d.def
- move rtmManipulator$(rtm_dllver)d.def ..\
+ move rtmManipulator$(rtm_dllver)d.def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib $(rtm_depend_libd)"
@@ -191,7 +191,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -226,7 +226,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(TargetDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver)d $(rtm_shortver) rtmManipulator$(rtm_dllver)d.def
- move rtmManipulator$(rtm_dllver)d.def ..\
+ move rtmManipulator$(rtm_dllver)d.def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkeld.lib;$(rtm_depend_libd);%(AdditionalDependencies)"
@@ -254,7 +254,7 @@
#------------------------------------------------------------
- Name: "Release|Win32"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -283,7 +283,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move rtmManipulator$(rtm_dllver).def ..\\
+ move rtmManipulator$(rtm_dllver).def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib $(rtm_depend_lib)"
@@ -309,7 +309,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -338,7 +338,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver) $(rtm_shortver) rtmManipulator$(rtm_dllver).def
- move rtmManipulator$(rtm_dllver).def ..\\
+ move rtmManipulator$(rtm_dllver).def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
@@ -365,7 +365,7 @@
copy "$(OutDir)\\rtmManipulator$(rtm_dllver).dll" "$(SolutionDir)bin\\"
- Name: "Release|x64"
OutputDirectory: "$(ProjectDir)$(TargetName)\\$(ConfigurationName)"
- IntermediateDirectory: "$(ConfigurationName)"
+ IntermediateDirectory: "$(TargetName)\\$(ConfigurationName)"
ConfigurationType: "2"
InheritedPropertySheets: "$(SolutionDir)rtm_config.vsprops;$(SolutionDir)rtm_distbuild.vsprops"
CharacterSet: "0"
@@ -394,7 +394,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib $(TargetName) $(rtm_shortver) $(TargetName).def
- move rtmManipulator$(rtm_dllver).def ..\\
+ move rtmManipulator$(rtm_dllver).def ..\\..\\
VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib $(rtm_depend_lib)"
@@ -420,7 +420,7 @@
copy "$(OutDir)\\$(TargetName).lib" "$(SolutionDir)bin\\"
copy "$(OutDir)\\$(TargetName).dll" "$(SolutionDir)bin\\"
VC10_OutputDirectory: "$(ProjectDir)$(TargetName)\\$(Configuration)"
- VC10_IntermediateDirectory: "$(Configuration)"
+ VC10_IntermediateDirectory: "$(TargetName)\\$(Configuration)"
VC10_InheritedPropertySheets:
- "$(SolutionDir)rtm_config.props"
- "$(SolutionDir)rtm_distbuild.props"
@@ -449,7 +449,7 @@
set PATH=%PATH%;$(rtm_path)
cd "$(OutDir)"
start /wait cmd /c makedeffile.py rtmManipulator_static.lib rtmManipulator$(rtm_dllver) $(rtm_shortver) rtmManipulator$(rtm_dllver).def
- move rtmManipulator$(rtm_dllver).def ..\\
+ move rtmManipulator$(rtm_dllver).def ..\\..\\
VC10_VCLinkerTool:
- Key: AdditionalDependencies
Value: "libRTCSkel.lib;$(rtm_depend_lib);%(AdditionalDependencies)"
openrtm-commit メーリングリストの案内