ARDrone SDK 2.0のビルドがコケるのをなんとかするパッチ

gistfile1.diff

96c96
< grep -r ^\#define ../../ARDroneLib/Soft/Common/navdata_common.h | grep NB_NAVDATA_DETECTION_RESULTS | sed 's/^\#define NB_NAVDATA_DETECTION_RESULTS \(.*\)/\#define ARDRONE_MAX_ENEMIES \1/g' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r ^\#define ../../ARDroneLib/Soft/Common/navdata_common.h | grep -h NB_NAVDATA_DETECTION_RESULTS | sed 's/^\#define NB_NAVDATA_DETECTION_RESULTS \(.*\)/\#define ARDRONE_MAX_ENEMIES \1/g' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
100c100
< grep -r ^LED_ANIMATION\( ../../ARDroneLib/Soft/Common/led_animation.h | tr -d ' ' | tr -d '\t' | sed 's/^LED_ANIMATION(\([A-Za-z_0-9=]*\),\(.*\))/ARDRONE_LED_ANIMATION_\1,/g' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r ^LED_ANIMATION\( ../../ARDroneLib/Soft/Common/led_animation.h | tr -d ' ' | tr -d '\t' | sed 's/^LED_ANIMATION(\([A-Za-z_0-9=]*\),\(.*\))/ARDRONE_LED_ANIMATION_\1,/g' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
105c105
< grep -r "\s*ARDRONE_ANIM_" ../../ARDroneLib/Soft/Common/config.h | tr -d ' ' | tr -d '\t' | sed 's/^ARDRONE_ANIM_\([A-Za-z_0-9=,]*\)/ARDRONE_ANIMATION_\1/' | sed 's/^ARDRONE_ANIM_\([A-Za-z_0-9,]*\)/ARDRONE_ANIMATION_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r "\s*ARDRONE_ANIM_" ../../ARDroneLib/Soft/Common/config.h | tr -d ' ' | tr -d '\t' | sed 's/^ARDRONE_ANIM_\([A-Za-z_0-9=,]*\)/ARDRONE_ANIMATION_\1/' | sed 's/^ARDRONE_ANIM_\([A-Za-z_0-9,]*\)/ARDRONE_ANIMATION_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
110c110
< grep -r "\s*CAD_TYPE_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/^CAD_TYPE_\([A-Za-z_0-9=,]*\)/ARDRONE_CAMERA_DETECTION_\1/' | sed 's/^CAD_TYPE_\([A-Za-z_0-9,]*\)/ARDRONE_CAMERA_DETECTION_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r "\s*CAD_TYPE_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/^CAD_TYPE_\([A-Za-z_0-9=,]*\)/ARDRONE_CAMERA_DETECTION_\1/' | sed 's/^CAD_TYPE_\([A-Za-z_0-9,]*\)/ARDRONE_CAMERA_DETECTION_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
115c115
< grep -r "\s*ZAP_CHANNEL_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/ZAP_CHANNEL_\([A-Za-z_0-9=,]*\)/ARDRONE_VIDEO_CHANNEL_\1/' | sed 's/ZAP_CHANNEL_\([A-Za-z_0-9,]*\)/ARDRONE_VIDEO_CHANNEL_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r "\s*ZAP_CHANNEL_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/ZAP_CHANNEL_\([A-Za-z_0-9=,]*\)/ARDRONE_VIDEO_CHANNEL_\1/' | sed 's/ZAP_CHANNEL_\([A-Za-z_0-9,]*\)/ARDRONE_VIDEO_CHANNEL_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
120c120
< grep -r "\s*VBC_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/VBC_\([A-Za-z_0-9=,]*\)/ARDRONE_VARIABLE_BITRATE_\1/' | sed 's/VBC_\([A-Za-z_0-9,]*\)/ARDRONE_VARIABLE_BITRATE_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r "\s*VBC_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/VBC_\([A-Za-z_0-9=,]*\)/ARDRONE_VARIABLE_BITRATE_\1/' | sed 's/VBC_\([A-Za-z_0-9,]*\)/ARDRONE_VARIABLE_BITRATE_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
125c125
< grep -r "\s*ARDRONE_DETECTION_COLOR_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/ARDRONE_DETECTION_COLOR_\([A-Za-z_0-9=,]*\)/ARDRONE_ENEMY_COLOR_\1/' | sed 's/ARDRONE_DETECTION_COLOR_\([A-Za-z_0-9,]*\)/ARDRONE_ENEMY_COLOR_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r "\s*ARDRONE_DETECTION_COLOR_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/ARDRONE_DETECTION_COLOR_\([A-Za-z_0-9=,]*\)/ARDRONE_ENEMY_COLOR_\1/' | sed 's/ARDRONE_DETECTION_COLOR_\([A-Za-z_0-9,]*\)/ARDRONE_ENEMY_COLOR_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
130c130
< grep -r ^ARDRONE_CONFIG_KEY_ ../../ARDroneLib/Soft/Common/config_keys.h | tr -d ' ' | tr -d '\t' | tr '[:lower:]' '[:upper:]' | grep K_WRITE | grep -e CONTROL -e NETWORK -e VIDEO -e LEDS -e DETECT -e GPS -e USERBOX | sed 's/^ARDRONE_CONFIG_KEY_\([IMM|STR]*\)\(_A10\)*("\([A-Za-z_0-9=",]*\)",\([A-Za-z_0-9=]*\),INI_\([A-Za-z_0-9=]*\),\(.*\))/ARDRONE_CONFIG_KEY_\4,\/\/\5/g' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r ^ARDRONE_CONFIG_KEY_ ../../ARDroneLib/Soft/Common/config_keys.h | tr -d ' ' | tr -d '\t' | tr '[:lower:]' '[:upper:]' | grep -h K_WRITE | grep -h -e CONTROL -e NETWORK -e VIDEO -e LEDS -e DETECT -e GPS -e USERBOX | sed 's/^ARDRONE_CONFIG_KEY_\([IMM|STR]*\)\(_A10\)*("\([A-Za-z_0-9=",]*\)",\([A-Za-z_0-9=]*\),INI_\([A-Za-z_0-9=]*\),\(.*\))/ARDRONE_CONFIG_KEY_\4,\/\/\5/g' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
135c135
< grep -r _CODEC.*\ *=\ *0x ../../ARDroneLib/VLIB/video_codec.h | tr -d ' ' | tr -d '\t' | sed 's/\([a-zA-Z0-9_]*\)_CODEC=0x\([0-9]*\).*/ARDRONE_VIDEO_CODEC_\1\ =\ 0x\2,/g' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r _CODEC.*\ *=\ *0x ../../ARDroneLib/VLIB/video_codec.h | tr -d ' ' | tr -d '\t' | sed 's/\([a-zA-Z0-9_]*\)_CODEC=0x\([0-9]*\).*/ARDRONE_VIDEO_CODEC_\1\ =\ 0x\2,/g' >> Release/ARDroneGeneratedTypes.h
140c140
< grep -r FLYING_MODE_.*, ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's:FLYING_MODE_\(.*\),/.*:ARDRONE_FLYING_MODE_\1,:g' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r FLYING_MODE_.*, ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's:FLYING_MODE_\(.*\),/.*:ARDRONE_FLYING_MODE_\1,:g' >> Release/ARDroneGeneratedTypes.h
145c145
< grep -r ACADEMY_STATE_.* ../../ARDroneLib/Soft/Common/academy_common.h | grep -v typedef | tr -d ' ' | tr -d '\t' | sed 's:ACADEMY_STATE_\([a-zA-Z0-9_]*\).*:ARDRONE_ACADEMY_STATE_\1,:g' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r ACADEMY_STATE_.* ../../ARDroneLib/Soft/Common/academy_common.h | grep -h -v typedef | tr -d ' ' | tr -d '\t' | sed 's:ACADEMY_STATE_\([a-zA-Z0-9_]*\).*:ARDRONE_ACADEMY_STATE_\1,:g' >> Release/ARDroneGeneratedTypes.h
150c150
< grep -r ACADEMY_RESULT_.* ../../ARDroneLib/Soft/Common/academy_common.h | grep -v typedef | tr -d ' ' | tr -d '\t' | sed 's:ACADEMY_RESULT_\([a-zA-Z0-9]*\).*:ARDRONE_ACADEMY_RESULT_\1,:g' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r ACADEMY_RESULT_.* ../../ARDroneLib/Soft/Common/academy_common.h | grep -h -v typedef | tr -d ' ' | tr -d '\t' | sed 's:ACADEMY_RESULT_\([a-zA-Z0-9]*\).*:ARDRONE_ACADEMY_RESULT_\1,:g' >> Release/ARDroneGeneratedTypes.h
155c155
< grep -r "\s*FLYING_STATE_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/VBC_\([A-Za-z_0-9=,]*\)/ARDRONE_FLYING_STATE_\1/' | sed 's/FLYING_STATE_\([A-Za-z_0-9,]*\)/ARDRONE_FLYING_STATE_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h
---
> grep -h -r "\s*FLYING_STATE_" ../../ARDroneLib/Soft/Common/ardrone_api.h | tr -d ' ' | tr -d '\t' | sed 's/VBC_\([A-Za-z_0-9=,]*\)/ARDRONE_FLYING_STATE_\1/' | sed 's/FLYING_STATE_\([A-Za-z_0-9,]*\)/ARDRONE_FLYING_STATE_\1/' | sed 's/\/\*.*\*\///' >> Release/ARDroneGeneratedTypes.h