Update copy-libs.sh

Author: Jason2866

tools/copy-libs.sh

@@ -391,66 +391,6 @@ echo "        '-Wl,-Map=\"%s\"' % join(\"\${BUILD_DIR}\", \"\${PROGNAME}.map\")"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
-# include dirs - nur noch Memory-Type und Framework Core
-echo "    CPPPATH=[" >> "$AR_PLATFORMIO_PY"
-echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")), \"include\")," >> "$AR_PLATFORMIO_PY"
-echo "        join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
-echo "    ]," >> "$AR_PLATFORMIO_PY"
-echo "" >> "$AR_PLATFORMIO_PY"
-
-AR_LIBS="$LD_LIBS"
-PIO_LIBS=""
-set -- $LD_LIBS
-for item; do
-	if [ "$PIO_LIBS" != "" ]; then
-		PIO_LIBS+=", "
-	fi
-	PIO_LIBS+="\"$item\""
-done
-
-set -- $LD_LIB_FILES
-for item; do
-	#echo "***** Stripping $item"
-	"$TOOLCHAIN-strip" -g "$item"
-	cp "$item" "$AR_SDK/lib/"
-done
-
-echo "    LIBPATH=[" >> "$AR_PLATFORMIO_PY"
-echo "        join($PIO_SDK, \"lib\")," >> "$AR_PLATFORMIO_PY"
-echo "        join($PIO_SDK, \"ld\")," >> "$AR_PLATFORMIO_PY"
-echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")))" >> "$AR_PLATFORMIO_PY"
-echo "    ]," >> "$AR_PLATFORMIO_PY"
-echo "" >> "$AR_PLATFORMIO_PY"
-
-echo "    LIBS=[" >> "$AR_PLATFORMIO_PY"
-echo "        $PIO_LIBS" >> "$AR_PLATFORMIO_PY"
-echo "    ]," >> "$AR_PLATFORMIO_PY"
-echo "" >> "$AR_PLATFORMIO_PY"
-
-echo "    CPPDEFINES=[" >> "$AR_PLATFORMIO_PY"
-set -- $DEFINES
-for item; do
-        item="${item:2}" #remove -D
-        item="${item/NDEBUG}" #remove NDEBUG
-	if [[ $item == *"="* ]]; then
-		item=(${item//=/ })
-		re='^[+-]?[0-9]+([.][0-9]+)?$'
-		if [[ ${item[1]} =~ $re ]]; then
-			echo "        (\"${item[0]}\", ${item[1]})," >> "$AR_PLATFORMIO_PY"
-		else
-			echo "        (\"${item[0]}\", '${item[1]}')," >> "$AR_PLATFORMIO_PY"
-		fi
-	else
-		echo "        \"$item\"," >> "$AR_PLATFORMIO_PY"
-	fi
-done
-
-# end generation of platformio-build.py
-cat configs/pio_end.txt >> "$AR_PLATFORMIO_PY"
-
-# replace double backslashes with single one
-DEFINES=`echo "$DEFINES" | tr -s '\'`
-
 # include dirs
 REL_INC=""
 
@@ -512,6 +452,74 @@ for item; do
 	fi
 done
 
+echo "    CPPPATH=[" >> "$AR_PLATFORMIO_PY"
+
+set -- $REL_INC
+for item; do
+	if [ "${item:0:17}" = "-iwithprefixbefore" ]; then
+		include_path="${item:18}"
+		echo "        join($PIO_SDK, \"include\", \"$include_path\")," >> "$AR_PLATFORMIO_PY"
+	fi
+done
+
+echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")), \"include\")," >> "$AR_PLATFORMIO_PY"
+echo "        join(FRAMEWORK_DIR, \"cores\", board_config.get(\"build.core\"))" >> "$AR_PLATFORMIO_PY"
+echo "    ]," >> "$AR_PLATFORMIO_PY"
+echo "" >> "$AR_PLATFORMIO_PY"
+
+AR_LIBS="$LD_LIBS"
+PIO_LIBS=""
+set -- $LD_LIBS
+for item; do
+	if [ "$PIO_LIBS" != "" ]; then
+		PIO_LIBS+=", "
+	fi
+	PIO_LIBS+="\"$item\""
+done
+
+set -- $LD_LIB_FILES
+for item; do
+	#echo "***** Stripping $item"
+	"$TOOLCHAIN-strip" -g "$item"
+	cp "$item" "$AR_SDK/lib/"
+done
+
+echo "    LIBPATH=[" >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, \"lib\")," >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, \"ld\")," >> "$AR_PLATFORMIO_PY"
+echo "        join($PIO_SDK, board_config.get(\"build.arduino.memory_type\", (board_config.get(\"build.flash_mode\", \"dio\") + \"_qspi\")))" >> "$AR_PLATFORMIO_PY"
+echo "    ]," >> "$AR_PLATFORMIO_PY"
+echo "" >> "$AR_PLATFORMIO_PY"
+
+echo "    LIBS=[" >> "$AR_PLATFORMIO_PY"
+echo "        $PIO_LIBS" >> "$AR_PLATFORMIO_PY"
+echo "    ]," >> "$AR_PLATFORMIO_PY"
+echo "" >> "$AR_PLATFORMIO_PY"
+
+echo "    CPPDEFINES=[" >> "$AR_PLATFORMIO_PY"
+set -- $DEFINES
+for item; do
+        item="${item:2}" #remove -D
+        item="${item/NDEBUG}" #remove NDEBUG
+	if [[ $item == *"="* ]]; then
+		item=(${item//=/ })
+		re='^[+-]?[0-9]+([.][0-9]+)?$'
+		if [[ ${item[1]} =~ $re ]]; then
+			echo "        (\"${item[0]}\", ${item[1]})," >> "$AR_PLATFORMIO_PY"
+		else
+			echo "        (\"${item[0]}\", '${item[1]}')," >> "$AR_PLATFORMIO_PY"
+		fi
+	else
+		echo "        \"$item\"," >> "$AR_PLATFORMIO_PY"
+	fi
+done
+
+# end generation of platformio-build.py
+cat configs/pio_end.txt >> "$AR_PLATFORMIO_PY"
+
+# replace double backslashes with single one
+DEFINES=`echo "$DEFINES" | tr -s '\'`
+
 # copy precompiled libs (if we need them)
 function copy_precompiled_lib(){
 	lib_file="$1"