timothy/mapper
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: include addon libs/ dir directly for flat header layout (tinyxml.h)

Browse Source
This commit is contained in:
Timothy Hofland
2026-03-15 22:04:33 +01:00
parent 1644159194
commit 4aa9b5a540
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/build.sh
View File

@ -246,12 +246,20 @@ if [ -f "$ADDONS_MAKE" ]; then
# Also include any libs/ bundled inside the addon (e.g. tinyxml in ofxXmlSettings) # Also include any libs/ bundled inside the addon (e.g. tinyxml in ofxXmlSettings)
addon_libs="$OF_DIR/addons/$addon_name/libs" addon_libs="$OF_DIR/addons/$addon_name/libs"
if [ -d "$addon_libs" ]; then 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 for alib in "$addon_libs"/*/; do
[ -d "$alib" ] || continue
# libs/<name>/include/ layout (e.g. other addons)
alib_inc="${alib}include" alib_inc="${alib}include"
[ -d "$alib_inc" ] || continue if [ -d "$alib_inc" ]; then
while IFS= read -r subdir; do while IFS= read -r subdir; do
OF_EXTRA_INCLUDES="$OF_EXTRA_INCLUDES -I$subdir" OF_EXTRA_INCLUDES="$OF_EXTRA_INCLUDES -I$subdir"
done < <(find "$alib_inc" -type d) 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 done
fi fi
done < "$ADDONS_MAKE" done < "$ADDONS_MAKE"