fix issue BehaviorTree#63 : compile on windows

Davide Faconti · Davide Faconti · commit c99e31b56b77 · 2019-03-08T17:08:02.000+01:00
diff --git a/include/behaviortree_cpp/bt_factory.h b/include/behaviortree_cpp/bt_factory.h
@@ -34,6 +34,13 @@ NodeBuilder;
 
 constexpr const char* PLUGIN_SYMBOL = "BT_RegisterNodesFromPlugin";
 
+#ifndef BT_PLUGIN_EXPORT
+
+#define BT_REGISTER_NODES(factory)                                                                 \
+        static void BT_RegisterNodesFromPlugin(BT::BehaviorTreeFactory& factory)
+
+#else
+
 #ifdef __linux__
 
 #define BT_REGISTER_NODES(factory)                                                                 \
@@ -42,14 +49,10 @@ constexpr const char* PLUGIN_SYMBOL = "BT_RegisterNodesFromPlugin";
 
 #elif _WIN32
 
-	#ifdef WIN_EXPORT
-
-	#define BT_REGISTER_NODES(factory)                                                                 \
+#define BT_REGISTER_NODES(factory)                                                                 \
 		__declspec(dllexport) void BT_RegisterNodesFromPlugin(BT::BehaviorTreeFactory& factory)
-	#else
-	#define BT_REGISTER_NODES(factory)                                                                 \
-		static void BT_RegisterNodesFromPlugin(BT::BehaviorTreeFactory& factory)
-		#endif
+#endif
+
 #endif
 
 
diff --git a/sample_nodes/CMakeLists.txt b/sample_nodes/CMakeLists.txt
@@ -2,6 +2,8 @@ cmake_minimum_required(VERSION 2.8)
 
 include_directories( ../include )
 
+# compile as static libraries
+
 add_library(crossdoor_nodes STATIC crossdoor_nodes.cpp )
 target_link_libraries(crossdoor_nodes PRIVATE ${BEHAVIOR_TREE_LIBRARY})
 
@@ -11,17 +13,17 @@ target_link_libraries(dummy_nodes PRIVATE ${BEHAVIOR_TREE_LIBRARY})
 add_library(movebase_node   STATIC movebase_node.cpp )
 target_link_libraries(movebase_node PRIVATE ${BEHAVIOR_TREE_LIBRARY})
 
-
+# to create a plugin, compile them in this way instead
 
 add_library(crossdoor_nodes_dyn SHARED crossdoor_nodes.cpp )
 target_link_libraries(crossdoor_nodes_dyn PRIVATE ${BEHAVIOR_TREE_LIBRARY})
-target_compile_definitions(crossdoor_nodes_dyn PRIVATE  WIN_EXPORT )
+target_compile_definitions(crossdoor_nodes_dyn PRIVATE  BT_PLUGIN_EXPORT )
 
 add_library(dummy_nodes_dyn     SHARED dummy_nodes.cpp )
 target_link_libraries(dummy_nodes_dyn PRIVATE ${BEHAVIOR_TREE_LIBRARY})
-target_compile_definitions(dummy_nodes_dyn  PRIVATE WIN_EXPORT)
+target_compile_definitions(dummy_nodes_dyn  PRIVATE BT_PLUGIN_EXPORT)
 
 add_library(movebase_node_dyn   SHARED movebase_node.cpp )
 target_link_libraries(movebase_node_dyn PRIVATE ${BEHAVIOR_TREE_LIBRARY})
-target_compile_definitions(movebase_node_dyn PRIVATE  WIN_EXPORT )
- 
+target_compile_definitions(movebase_node_dyn PRIVATE  BT_PLUGIN_EXPORT )
+ 
