[openrtm-commit:01588] r2654 - in tags/RELEASE_1_1_1/OpenRTM-aist: . build

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-07-27 17:47:50 +0900 (Mon, 27 Jul 2015)
New Revision: 2654

Modified:
   tags/RELEASE_1_1_1/OpenRTM-aist/
   tags/RELEASE_1_1_1/OpenRTM-aist/build/cmakeconfgen.py
Log:
r2653 has been merged from trunk. about define of RTC_CORBA_CXXMAPPING11.


Property changes on: tags/RELEASE_1_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_1/OpenRTM-aist:2601,2603
/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,2573-2574,2592,2605,2639
   + /branches/RELENG_1_1/OpenRTM-aist:2601,2603
/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,2573-2574,2592,2605,2639,2653

Modified: tags/RELEASE_1_1_1/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist/build/cmakeconfgen.py	2015-07-27 08:32:38 UTC (rev 2653)
+++ tags/RELEASE_1_1_1/OpenRTM-aist/build/cmakeconfgen.py	2015-07-27 08:47:50 UTC (rev 2654)
@@ -211,10 +211,10 @@
     omni_cflags += ";-D_CRT_SECURE_NO_DEPRECATE"
 
     rtm_cflags = omni_cflags + ";-DINCLUDE_stub_in_nt_dll"
-    if re.match("^41", dict["omni_dllver"]):
+    if re.match("^40", dict["omni_dllver"]):
+        rtm_cflags += ";-D_WIN32_WINNT=0x0400"
+    else:
         rtm_cflags += ";-DRTC_CORBA_CXXMAPPING11;-D_WIN32_WINNT=0x0500"
-    else:
-        rtm_cflags += ";-D_WIN32_WINNT=0x0400"
 
     # libs
     omni_libs  = process_lib(dict["omni_lib"], "optimized")