fix: include addon libs/ dir directly for flat header layout (tinyxml.h)
This commit is contained in:
@ -246,12 +246,20 @@ if [ -f "$ADDONS_MAKE" ]; then
|
||||
# Also include any libs/ bundled inside the addon (e.g. tinyxml in ofxXmlSettings)
|
||||
addon_libs="$OF_DIR/addons/$addon_name/libs"
|
||||
if [ -d "$addon_libs" ]; then
|
||||
# Some addons (ofxXmlSettings) keep headers directly in libs/ (flat layout)
|
||||
OF_EXTRA_INCLUDES="$OF_EXTRA_INCLUDES -I$addon_libs"
|
||||
for alib in "$addon_libs"/*/; do
|
||||
[ -d "$alib" ] || continue
|
||||
# libs/<name>/include/ layout (e.g. other addons)
|
||||
alib_inc="${alib}include"
|
||||
[ -d "$alib_inc" ] || continue
|
||||
while IFS= read -r subdir; do
|
||||
OF_EXTRA_INCLUDES="$OF_EXTRA_INCLUDES -I$subdir"
|
||||
done < <(find "$alib_inc" -type d)
|
||||
if [ -d "$alib_inc" ]; then
|
||||
while IFS= read -r subdir; do
|
||||
OF_EXTRA_INCLUDES="$OF_EXTRA_INCLUDES -I$subdir"
|
||||
done < <(find "$alib_inc" -type d)
|
||||
else
|
||||
# headers directly in libs/<name>/ (no include/ subdir)
|
||||
OF_EXTRA_INCLUDES="$OF_EXTRA_INCLUDES -I${alib%/}"
|
||||
fi
|
||||
done
|
||||
fi
|
||||
done < "$ADDONS_MAKE"
|
||||
|
||||
Reference in New Issue
Block a user