[openrtm-commit:01587] r2653 - trunk/OpenRTM-aist/build

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-07-27 17:32:38 +0900 (Mon, 27 Jul 2015)
New Revision: 2653

Modified:
   trunk/OpenRTM-aist/build/cmakeconfgen.py
Log:
[compat, ->RELENG_1_1] RTC_CORBA_CXXMAPPING11 settings for Windows has been changed.

Modified: trunk/OpenRTM-aist/build/cmakeconfgen.py
===================================================================
--- trunk/OpenRTM-aist/build/cmakeconfgen.py	2015-07-23 00:10:33 UTC (rev 2652)
+++ trunk/OpenRTM-aist/build/cmakeconfgen.py	2015-07-27 08:32:38 UTC (rev 2653)
@@ -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")