[openrtm-commit:01676] r2692 - in trunk/OpenRTM-aist: build win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-01-13 15:35:17 +0900 (Wed, 13 Jan 2016)
New Revision: 2692

Modified:
   trunk/OpenRTM-aist/build/cmakeconfgen.py
   trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
Log:
[compat, ->RELENG_1_1] Issue of r2678 has been modified.  refs #3312

Modified: trunk/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- trunk/OpenRTM-aist/build/cmakeconfgen.py	2016-01-08 04:51:03 UTC (rev 2691)
+++ trunk/OpenRTM-aist/build/cmakeconfgen.py	2016-01-13 06:35:17 UTC (rev 2692)
@@ -274,10 +274,10 @@
     # libs
     omni_libs  = process_lib(dict["omni_lib"], "optimized")
     omni_libs += ";" + process_lib(dict["omni_libd"], "debug")
-    rtm_libs   = process_lib(dict["rtm_lib"], "optimized")
-    rtm_libs  += ";" + process_lib(dict["rtm_libd"], "debug")
-    rtm_libs_x64   = process_lib(dict["rtm_lib_x64"], "optimized")
-    rtm_libs_x64  += ";" + process_lib(dict["rtm_libd_x64"], "debug")
+    rtm_libs   = process_lib(dict["rtm_cmake_lib"], "optimized")
+    rtm_libs  += ";" + process_lib(dict["rtm_cmake_libd"], "debug")
+    rtm_libs_x64   = process_lib(dict["rtm_cmake_lib_x64"], "optimized")
+    rtm_libs_x64  += ";" + process_lib(dict["rtm_cmake_libd_x64"], "debug")
 
 
     dict["omniorb_cflags"] = omni_cflags

Modified: trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops
===================================================================
--- trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2016-01-08 04:51:03 UTC (rev 2691)
+++ trunk/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.vsprops	2016-01-13 06:35:17 UTC (rev 2692)
@@ -101,22 +101,39 @@
 	/>
 	<UserMacro
 		Name="rtm_libd"
-		Value="RTC$(rtm_cmake_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) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
 	/>
 	<UserMacro
 		Name="rtm_libd_x64"
 
-		Value="RTC$(rtm_cmake_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) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
 	/>
 	<UserMacro
 		Name="rtm_lib"
-		Value="RTC$(rtm_cmake_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+		Value="RTC$(rtm_dllver).lib $(coil_lib) $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
 	/>
 	<UserMacro
 		Name="rtm_lib_x64"
-		Value="RTC$(rtm_cmake_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) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
 	/>
 	<UserMacro
+		Name="rtm_cmake_libd"
+		Value="RTC$(rtm_cmake_dllver)d.lib coil$(coil_cmake_dllver)d.lib $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+	/>
+	<UserMacro
+		Name="rtm_cmake_libd_x64"
+
+		Value="RTC$(rtm_cmake_dllver_x64)d.lib coil$(coil_cmake_dllver_x64)d.lib $(omni_libd) advapi32.lib ws2_32.lib mswsock.lib $(user_libd)"
+	/>
+	<UserMacro
+		Name="rtm_cmake_lib"
+		Value="RTC$(rtm_cmake_dllver).lib coil$(coil_cmake_dllver).lib $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+	/>
+	<UserMacro
+		Name="rtm_cmake_lib_x64"
+		Value="RTC$(rtm_cmake_dllver_x64).lib coil$(coil_cmake_dllver_x64).lib $(omni_lib) advapi32.lib ws2_32.lib mswsock.lib $(user_lib)"
+	/>
+	<UserMacro
 		Name="rtm_idlc"
 		Value="omniidl"
 	/>
@@ -127,19 +144,18 @@
 	<!-- coil macros -->
 	<UserMacro
 		Name="coil_lib"
-		Value="coil$(coil_cmake_dllver).lib"
+		Value="coil$(coil_dllver).lib"
 	/>
 	<UserMacro
 		Name="coil_lib_x64"
-		Value="coil$(coil_cmake_dllver_x64).lib"
+		Value="coil$(coil_dllver_x64).lib"
 	/>
 	<UserMacro
 		Name="coil_libd"
-		Value="coil$(coil_cmake_dllver)d.lib"
+		Value="coil$(coil_dllver)d.lib"
 	/>
 	<UserMacro
 		Name="coil_libd_x64"
-		Value="coil$(coil_cmake_dllver_x64)d.lib"
+		Value="coil$(coil_dllver_x64)d.lib"
 	/>
-
 </VisualStudioPropertySheet>