Commit bf90fcdf authored by Arnaud Blanchard's avatar Arnaud Blanchard
Browse files

Fix merge problem

parent 6b00ff43
......@@ -26,11 +26,11 @@ find_library(BLC_CORE_LIBRARY blc_core)
add_library(shared_blc_program SHARED ${blc_sources})
add_library(static_blc_program STATIC ${blc_sources})
target_link_libraries(shared_blc_program shared_blc_core)
target_link_libraries(shared_blc_program ${BLC_CORE_LIBRARIES})
set(BLC_PROGRAM_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/include PARENT_SCOPE)
set(BLC_PROGRAM_LIBRARY shared_blc_program PARENT_SCOPE)
set(BLC_PROGRAM_LIBRARIES shared_blc_program ${BLC_CORE_LIBRARIES} PARENT_SCOPE)
#Both librairies have the same name only the extension will change depending on the OS
set_target_properties(shared_blc_program PROPERTIES OUTPUT_NAME blc_program)
......
......@@ -35,13 +35,10 @@ extern type_blc_status blc_status;
#define BLC_COMMAND_LOOP_THREAD() for(blc_command_loop_init(-2); blc_command_loop_start();blc_command_loop_end())
/** Warning the period can be till 10ms longer than, asked. Problem of usleep/nano sleep */
/**
0 for system as fast as possible, -1 for blocking on keyborad.
Warning the period can be till 10ms longer than, asked. Problem of usleep/nano sleep */
#define BLC_COMMAND_LOOP(period) for(blc_command_loop_init(period); blc_command_loop_start();blc_command_loop_end())
<<<<<<< HEAD
=======
#define BLC_COMMAND_LOOP_NON_STOP() for(blc_command_loop_init(0); blc_command_loop_start();blc_command_loop_end())
#define BLC_COMMAND_LOOP_BLOCK() for(blc_command_loop_init(-1); blc_command_loop_start();blc_command_loop_end())
>>>>>>> b9a2706e58c864b35f13ec446e455d61c41f4f02
typedef void (*type_blc_command_cb)(char const *arguement, void *user_data);
extern long blc_command_loop_period;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment