Skip to content

Commit 01dd1e9

Browse files
committed
remove arduino defines
1 parent 69dccc6 commit 01dd1e9

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

tools/prepare-libs.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ for item in "${@:2:${#@}-5}"; do
7676
INCLUDES+="$item "
7777
fi
7878
elif [ "$prefix" = "-D" ]; then
79-
DEFINES+="$item "
79+
if [[ "${item:2:7}" != "ARDUINO" ]] && [[ "$item" != "-DESP32" ]]; then #skip ARDUINO defines
80+
DEFINES+="$item "
81+
fi
8082
elif [[ "$item" != "-Wall" && "$item" != "-Werror=all" && "$item" != "-Wextra" ]]; then
8183
C_FLAGS+="$item "
8284
fi
@@ -335,22 +337,20 @@ echo " CPPDEFINES=[" >> "$AR_PLATFORMIO_PY"
335337
set -- $DEFINES
336338
for item; do
337339
item="${item:2}" #remove -D
338-
if [[ "${item:0:7}" != "ARDUINO" ]] && [[ "$item" != "ESP32" ]]; then #skip ARDUINO defines
339-
if [[ $item == *"="* ]]; then
340-
item=(${item//=/ })
341-
re='^[+-]?[0-9]+([.][0-9]+)?$'
342-
if [[ ${item[1]} =~ $re ]]; then
343-
echo " (\"${item[0]}\", ${item[1]})," >> "$AR_PLATFORMIO_PY"
344-
else
345-
echo " (\"${item[0]}\", '${item[1]}')," >> "$AR_PLATFORMIO_PY"
346-
fi
340+
if [[ $item == *"="* ]]; then
341+
item=(${item//=/ })
342+
re='^[+-]?[0-9]+([.][0-9]+)?$'
343+
if [[ ${item[1]} =~ $re ]]; then
344+
echo " (\"${item[0]}\", ${item[1]})," >> "$AR_PLATFORMIO_PY"
347345
else
348-
echo " \"$item\"," >> "$AR_PLATFORMIO_PY"
346+
echo " (\"${item[0]}\", '${item[1]}')," >> "$AR_PLATFORMIO_PY"
349347
fi
348+
else
349+
echo " \"$item\"," >> "$AR_PLATFORMIO_PY"
350350
fi
351351
done
352352

353-
# remobe backslashes for Arduino
353+
# remove backslashes for Arduino
354354
DEFINES=`echo "$DEFINES" | tr -d '\\'`
355355

356356

0 commit comments

Comments
 (0)