Patches to make SDK 2.0.1 compile and link with ROS driver

Esse commit está contido em:
Mani Monajjemi
2013-10-22 21:00:02 -07:00
commit afa3bd2ecc
3 arquivos alterados com 7 adições e 3 exclusões
+2 -2
Ver Arquivo
@@ -332,11 +332,11 @@ int ardrone_tool_main(int argc, char **argv)
argc--; argv++; argc--; argv++;
} }
if( show_usage || (argc != 0) ) /*if( show_usage || (argc != 0) )
{ {
ardrone_tool_usage( appname ); ardrone_tool_usage( appname );
exit(-1); exit(-1);
} }*/
/* After a first analysis, the arguments are restored so they can be passed to the user-defined functions */ /* After a first analysis, the arguments are restored so they can be passed to the user-defined functions */
argc=argc_backup; argc=argc_backup;
+1 -1
Ver Arquivo
@@ -66,7 +66,7 @@ C_RESULT ardrone_tool_shutdown(void);
void ardrone_tool_init_timers_and_mutex(); void ardrone_tool_init_timers_and_mutex();
void ardrone_tool_send_com_watchdog(void); // To send it only once void ardrone_tool_send_com_watchdog(void); // To send it only once
int main(); //int main();
// There because not defined in embedded // There because not defined in embedded
void api_configuration_get_ctrl_mode(void); void api_configuration_get_ctrl_mode(void);
+4
Ver Arquivo
@@ -105,6 +105,10 @@ define ADD_RULE_TEMPLATE
ifeq ($(USE_ANDROID),yes) ifeq ($(USE_ANDROID),yes)
build_lib: build_$(1) build_lib: build_$(1)
endif endif
# Following three lines added after more than four hours of WTF debugging -- mani
ifeq ($(USE_LINUX),yes)
build_lib: build_$(1)
endif
endif endif
endif endif
endif endif