[openrtm-commit:01944] r2725 - in branches/RELENG_1_1/OpenRTM-aist: . win32/OpenRTM-aist

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2016-05-24 11:30:07 +0900 (Tue, 24 May 2016)
New Revision: 2725

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
Log:
[merge] r2724 has been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568-2574,2592,2605,2610,2623,2626,2644,2648,2652-2653,2670,2677-2678,2681-2682,2684-2687,2689-2692,2696-2697,2700,2703,2706,2711-2712,2715-2721,2724

Modified: branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props	2016-05-24 02:26:08 UTC (rev 2724)
+++ branches/RELENG_1_1/OpenRTM-aist/win32/OpenRTM-aist/rtm_config.props	2016-05-24 02:30:07 UTC (rev 2725)
@@ -14,7 +14,7 @@
     <omni_bin>$(omni_root)\bin\x86_win32</omni_bin>
     <omni_lib>omniORB$(omni_dllver)_rt.lib;omniDynamic$(omni_dllver)_rt.lib;omnithread$(omnithread_dllver)_rt.lib</omni_lib>
     <omni_libd>omniORB$(omni_dllver)_rtd.lib;omniDynamic$(omni_dllver)_rtd.lib;omnithread$(omnithread_dllver)_rtd.lib</omni_libd>
-    <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl</rtm_includes>
+    <rtm_includes>$(rtm_root);$(rtm_root)\rtm\idl;$(rtm_root)\rtm\ext</rtm_includes>
     <rtm_libdir>$(rtm_root)\bin</rtm_libdir>
     <rtm_bin>$(rtm_root)\bin;$(rtm_root)\build</rtm_bin>
     <rtm_path>$(rtm_bin);$(omni_bin)</rtm_path>