mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-06-04 13:55:40 +08:00
[modules] split define and include
also reuse 'type' attribute for string flags
This commit is contained in:
committed by
Felix Ruess
parent
d14135246e
commit
1fdea9387b
@@ -32,7 +32,7 @@
|
||||
<file name="bebop_front_camera.c"/>
|
||||
|
||||
<!-- Include the needed Computer Vision files -->
|
||||
<define name="modules/computer_vision" type="include"/>
|
||||
<include name="modules/computer_vision"/>
|
||||
<file name="image.c" dir="modules/computer_vision/lib/vision"/>
|
||||
<file name="v4l2.c" dir="modules/computer_vision/lib/v4l"/>
|
||||
<file name="jpeg.c" dir="modules/computer_vision/lib/encoding"/>
|
||||
|
||||
@@ -78,7 +78,7 @@
|
||||
|
||||
<makefile target="ap">
|
||||
<!-- Include the needed Computer Vision files -->
|
||||
<define name="modules/computer_vision" type="include"/>
|
||||
<include name="modules/computer_vision"/>
|
||||
<file name="image.c" dir="modules/computer_vision/lib/vision"/>
|
||||
<file name="jpeg.c" dir="modules/computer_vision/lib/encoding"/>
|
||||
<file name="rtp.c" dir="modules/computer_vision/lib/encoding"/>
|
||||
|
||||
@@ -43,8 +43,8 @@
|
||||
<file name="img_scanner.c" dir="$(LIBZBAR)/zbar"/>
|
||||
|
||||
<!-- libexif flags -->
|
||||
<define name="$(LIBZBAR)/zbar" type="include"/>
|
||||
<define name="$(LIBZBAR)/include" type="include"/>
|
||||
<include name="$(LIBZBAR)/zbar"/>
|
||||
<include name="$(LIBZBAR)/include"/>
|
||||
|
||||
<!--define name="DEBUG_QR_FINDER" value="1"/-->
|
||||
|
||||
|
||||
@@ -12,11 +12,12 @@
|
||||
<!ELEMENT event (handler*)>
|
||||
<!ELEMENT handler EMPTY>
|
||||
<!ELEMENT datalink EMPTY>
|
||||
<!ELEMENT makefile (configure|define|flag|file|file_arch|raw)*>
|
||||
<!ELEMENT makefile (configure|define|include|flag|file|file_arch|raw)*>
|
||||
<!ELEMENT section (define|configure)*>
|
||||
<!ELEMENT description (#PCDATA)>
|
||||
<!ELEMENT configure EMPTY>
|
||||
<!ELEMENT define EMPTY>
|
||||
<!ELEMENT include EMPTY>
|
||||
<!ELEMENT flag EMPTY>
|
||||
<!ELEMENT file EMPTY>
|
||||
<!ELEMENT file_arch EMPTY>
|
||||
@@ -77,6 +78,10 @@ type CDATA #IMPLIED
|
||||
description CDATA #IMPLIED
|
||||
cond CDATA #IMPLIED>
|
||||
|
||||
<!ATTLIST include
|
||||
name CDATA #REQUIRED
|
||||
cond CDATA #IMPLIED>
|
||||
|
||||
<!ATTLIST flag
|
||||
name CDATA #REQUIRED
|
||||
value CDATA #REQUIRED>
|
||||
|
||||
@@ -17,7 +17,7 @@
|
||||
</header>
|
||||
<periodic fun="push_gps_to_vision()" freq="8"/>
|
||||
<makefile target="ap">
|
||||
<define name="modules/computer_vision" type="include"/>
|
||||
<include name="modules/computer_vision"/>
|
||||
<file name="exif_module.c" dir="modules/computer_vision/lib/exif"/>
|
||||
|
||||
<!-- libexif -->
|
||||
|
||||
@@ -36,7 +36,7 @@
|
||||
|
||||
<file name="viewvideo.c"/>
|
||||
<!-- Include the needed Computer Vision files -->
|
||||
<define name="modules/computer_vision" type="include"/>
|
||||
<include name="modules/computer_vision"/>
|
||||
<file name="rtp.c" dir="modules/computer_vision/lib/encoding"/>
|
||||
|
||||
<!-- Define the network connection to send images over -->
|
||||
|
||||
@@ -41,7 +41,7 @@
|
||||
<file name="cv.c"/>
|
||||
|
||||
<!-- Include the needed Computer Vision files -->
|
||||
<define name="modules/computer_vision" type="include"/>
|
||||
<include name="modules/computer_vision"/>
|
||||
<file name="image.c" dir="modules/computer_vision/lib/vision"/>
|
||||
<file name="v4l2.c" dir="modules/computer_vision/lib/v4l"/>
|
||||
<file name="jpeg.c" dir="modules/computer_vision/lib/encoding"/>
|
||||
|
||||
Reference in New Issue
Block a user