[openrtm-commit:02365] r2914 - in trunk/OpenRTM-aist: . win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2017-02-01 18:01:07 +0900 (Wed, 01 Feb 2017)
New Revision: 2914

Modified:
   trunk/OpenRTM-aist/configure.ac
   trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[compat,->RELENG_1_2] Links of rtmCamera and rtmManipulator have been added to OpenRTMConfig.cmake. refs #3889

Modified: trunk/OpenRTM-aist/configure.ac
===================================================================
--- trunk/OpenRTM-aist/configure.ac	2017-02-01 06:57:12 UTC (rev 2913)
+++ trunk/OpenRTM-aist/configure.ac	2017-02-01 09:01:07 UTC (rev 2914)
@@ -243,8 +243,8 @@
 	LDFLAGS="-L$lpath $LDFLAGS"
 done
 
+LIBS="$LIBS -lrtmCamera -lrtmManipulator"
 
-
 dnl this is needed for creating libraries using libtool
 dnl AC_LIBTOOL_WIN32_DLL
 dnl AC_LIBLTDL_CONVENIENCE

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2017-02-01 06:57:12 UTC (rev 2913)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2017-02-01 09:01:07 UTC (rev 2914)
@@ -85,20 +85,19 @@
 	/>
 	<UserMacro
 		Name="rtm_libd"
-		Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+		Value="RTC$(rtm_dllver)d.lib $(coil_libd) $(omni_libd) $(rtm_ext_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
 	/>
 	<UserMacro
 		Name="rtm_libd_x64"
-
-		Value="RTC$(rtm_dllver_x64)d.lib $(coil_libd_x64) $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+		Value="RTC$(rtm_dllver_x64)d.lib $(coil_libd_x64) $(omni_libd) $(rtm_ext_libd_x64) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
 	/>
 	<UserMacro
 		Name="rtm_lib"
-		Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+		Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) $(rtm_ext_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
 	/>
 	<UserMacro
 		Name="rtm_lib_x64"
-		Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+		Value="RTC$(rtm_dllver_x64).lib $(coil_lib_x64) $(omni_lib) $(rtm_ext_lib_x64) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
 	/>
 	<UserMacro
 		Name="rtm_idlc"
@@ -125,4 +124,20 @@
 		Name="coil_libd_x64"
 		Value="coil$(coil_dllver_x64)d.lib"
 	/>
+	<UserMacro
+		Name="rtm_ext_lib"
+		Value="rtmCamera$(rtm_dllver).lib rtmManipulator$(rtm_dllver).lib"
+	/>
+	<UserMacro
+		Name="rtm_ext_libd"
+		Value="rtmCamera$(rtm_dllver)d.lib rtmManipulator$(rtm_dllver)d.lib"
+	/>
+	<UserMacro
+		Name="rtm_ext_lib_x64"
+		Value="rtmCamera$(rtm_dllver_x64).lib rtmManipulator$(rtm_dllver_x64).lib"
+	/>
+	<UserMacro
+		Name="rtm_ext_libd_x64"
+		Value="rtmCamera$(rtm_dllver_x64)d.lib rtmManipulator$(rtm_dllver_x64)d.lib"
+	/>
 </VisualStudioPropertySheet>