[openrtm-commit:02931] r3084 - in trunk/OpenRTM-aist: . src/lib/coil/win32/coil

[openrtm ＠ openrtm.org]

Author: miyamoto
Date: 2017-11-21 18:29:22 +0900 (Tue, 21 Nov 2017)
New Revision: 3084

Modified:
   trunk/OpenRTM-aist/CMakeLists.txt
   trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
Log:
[compat] Support Windows 10 IoT.

Modified: trunk/OpenRTM-aist/CMakeLists.txt
===================================================================
--- trunk/OpenRTM-aist/CMakeLists.txt	2017-11-20 08:56:15 UTC (rev 3083)
+++ trunk/OpenRTM-aist/CMakeLists.txt	2017-11-21 09:29:22 UTC (rev 3084)
@@ -155,17 +155,31 @@
 		endif()
 		set(ORB_LIBRARIES omniDynamic4 omniORB4 omnithread)
 	elseif(UNIX)
-		SET (ORB_C_FLAGS_LIST
-			-D__x86__
-		)
+		if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "ARM")
+			SET (ORB_C_FLAGS_LIST
+				-D__arm__
+			)
+		else()
+			SET (ORB_C_FLAGS_LIST
+				-D__x86__
+			)
+		endif()
 		set(ORB_LINK_DIR ${ORB_ROOT}/lib)
 		set(ORB_LIBRARIES omniDynamic4 omniORB4 omnithread)
 	elseif(MSVC)
-		SET (ORB_C_FLAGS_LIST
-			-D__WIN32__
-			-D__x86__
-		)
-		set(ORB_LINK_DIR ${ORB_ROOT}/lib/x86_win32)
+		if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "ARM")
+			SET (ORB_C_FLAGS_LIST
+				-D__WIN32__
+				-D__arm__
+			)
+			set(ORB_LINK_DIR ${ORB_ROOT}/lib/ARM_win32)
+		else()
+			SET (ORB_C_FLAGS_LIST
+				-D__WIN32__
+				-D__x86__
+			)
+			set(ORB_LINK_DIR ${ORB_ROOT}/lib/x86_win32)
+		endif()
 		set(ORB_LIBRARIES optimized;omniDynamic${OMNI_VERSION}${OMNI_MINOR}_rt;optimized;omniORB${OMNI_VERSION}${OMNI_MINOR}_rt;omnithread${OMNITHREAD_VERSION}_rt;debug;omniDynamic${OMNI_VERSION}${OMNI_MINOR}_rtd;debug;omniORB${OMNI_VERSION}${OMNI_MINOR}_rtd;debug;omnithread${OMNITHREAD_VERSION}_rtd)
 	endif(VXWORKS)
 
@@ -184,7 +198,7 @@
 			SET(ORB_C_FLAGS_LIST -D__x86__)
 		endif()
 		SET(ORB_C_FLAGS_LIST ${ORB_C_FLAGS_LIST} -DACE_VXWORKS=0x690 -DACE_HAS_PTHREADS -DACE_HAS_AIO_CALLS -DACE_LACKS_ISBLANK)
-message(STATUS ${ORB_ROOT}/lib)
+
 		set(ORB_LINK_DIR ${ORB_ROOT}/lib)
 		set(ORB_LIBRARIES   TAO_AnyTypeCode TAO_PortableServer TAO_Svc_Utils TAO_CosNaming   TAO_AnyTypeCode TAO_DynamicInterface TAO_PI TAO_Utils TAO_PortableServer TAO_DiffServPolicy TAO_DynamicInterface  TAO ACE)
 		set(ORB_INCLUDE_DIR ${ORB_ROOT} ${ORB_ROOT}/TAO ${ORB_ROOT}/TAO/orbsvcs)

Modified: trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp
===================================================================
--- trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp	2017-11-20 08:56:15 UTC (rev 3083)
+++ trunk/OpenRTM-aist/src/lib/coil/win32/coil/Routing.cpp	2017-11-21 09:29:22 UTC (rev 3084)
@@ -17,6 +17,18 @@
  *
  */
 
+
+#ifdef __arm__
+#include <coil/Routing.h>
+namespace coil
+{
+  bool dest_to_endpoint(std::string dest_addr, std::string& endpoint)
+  {
+    return false;
+  }
+};
+#else
+
 #ifndef NTDDI_VERSION
 #define NTDDI_VERSION 0x05000000
 #define WINVER _WIN32_WINNT
@@ -32,6 +44,10 @@
 #include <ws2tcpip.h>
 #include <iphlpapi.h>
 
+
+
+
+
 #pragma comment(lib, "iphlpapi.lib")
 #pragma comment(lib, "ws2_32.lib")
 
@@ -125,3 +141,5 @@
   
   
 }; // namespace coil
+
+#endif