Update copy-libs.sh

Author: Jason2866

tools/copy-libs.sh

@@ -80,9 +80,6 @@ PIO_LD_FLAGS="-flto "
 PIO_LD_FUNCS=""
 PIO_LD_SCRIPTS=""
 
-# Variable für Include-Verkürzung
-SHORTENED_INCLUDES=""
-
 TOOLCHAIN_PREFIX=""
 if [ "$IS_XTENSA" = "y" ]; then
 	TOOLCHAIN="xtensa-$IDF_TARGET-elf"
@@ -319,66 +316,21 @@ done
 # END OF DATA EXTRACTION FROM CMAKE
 #
 
-# SAMMLE INCLUDE-PFADE FÜR VERKÜRZUNG (VOR der pioarduino-build.py Generierung)
-set -- $INCLUDES
-for item; do
-	if [[ "$item" != $PWD ]]; then
-		ipath="$item"
-		fname=`basename "$ipath"`
-		dname=`basename $(dirname "$ipath")`
-		if [[ "$fname" == "main" && "$dname" == $(basename "$PWD") ]]; then
-			continue
-		fi
-		while [[ "$dname" != "components" && "$dname" != "managed_components" && "$dname" != "build" ]]; do
-			ipath=`dirname "$ipath"`
-			fname=`basename "$ipath"`
-			dname=`basename $(dirname "$ipath")`
-		done
-		if [[ "$fname" == "arduino" ]]; then
-			continue
-		fi
-		if [[ "$fname" == "config" ]]; then
-			continue
-		fi
-
-		out_sub="${item#*$ipath}"
-		
-		# SAMMLE FÜR INCLUDE-VERKÜRZUNG
-		if [ "$out_sub" = "" ]; then
-			SHORTENED_INCLUDES+=" -iwithprefix/include/$fname"
-		else
-			sub_clean="${out_sub#/}"  # Entferne führenden Slash
-			SHORTENED_INCLUDES+=" -iwithprefix/include/$fname/$sub_clean"
-		fi
-	fi
-done
-
 mkdir -p "$AR_SDK"
 
 # start generation of pioarduino-build.py
 AR_PLATFORMIO_PY="$AR_SDK/pioarduino-build.py"
 cat configs/pio_start.txt > "$AR_PLATFORMIO_PY"
 
-# ASFLAGS mit Include-Verkürzung - KORRIGIERT
+# ASFLAGS mit Prefix-Optionen für flags/includes
 echo "    ASFLAGS=[" >> "$AR_PLATFORMIO_PY"
 if [ "$IS_XTENSA" = "y" ]; then
 	echo "        \"-mlongcalls\"," >> "$AR_PLATFORMIO_PY"
 else
 	echo "        \"-march=rv32imc\"," >> "$AR_PLATFORMIO_PY"
 fi
-
-# Füge Include-Verkürzung direkt hinzu - KORRIGIERT
-if [[ -n "$SHORTENED_INCLUDES" ]]; then
-    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
-    # KORREKT: Verwende array statt while-loop
-    IFS=' ' read -ra shortened_array <<< "$SHORTENED_INCLUDES"
-    for flag in "${shortened_array[@]}"; do
-        if [[ -n "$flag" ]]; then
-            echo "        \"$flag\"," >> "$AR_PLATFORMIO_PY"
-        fi
-    done
-fi
-
+echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
+echo "        \"@\" + join(\$PIO_SDK, \"flags\", \"includes\")" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
@@ -415,25 +367,14 @@ echo "        \"$last_item\"" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
 
-# CCFLAGS mit Include-Verkürzung - KORRIGIERT
+# CCFLAGS mit Prefix-Optionen für flags/includes
 echo "    CCFLAGS=[" >> "$AR_PLATFORMIO_PY"
 set -- $PIO_CC_FLAGS
 for item; do
 	echo "        \"$item\"," >> "$AR_PLATFORMIO_PY"
 done
-
-# Füge Include-Verkürzung direkt hinzu - KORRIGIERT
-if [[ -n "$SHORTENED_INCLUDES" ]]; then
-    echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
-    # KORREKT: Verwende array statt while-loop
-    IFS=' ' read -ra shortened_array <<< "$SHORTENED_INCLUDES"
-    for flag in "${shortened_array[@]}"; do
-        if [[ -n "$flag" ]]; then
-            echo "        \"$flag\"," >> "$AR_PLATFORMIO_PY"
-        fi
-    done
-fi
-
+echo "        \"-iprefix\", join(FRAMEWORK_DIR, \"tools\", \"sdk\", \"$IDF_TARGET\")," >> "$AR_PLATFORMIO_PY"
+echo "        \"@\" + join(\$PIO_SDK, \"flags\", \"includes\")," >> "$AR_PLATFORMIO_PY"
 echo "        \"-MMD\"" >> "$AR_PLATFORMIO_PY"
 echo "    ]," >> "$AR_PLATFORMIO_PY"
 echo "" >> "$AR_PLATFORMIO_PY"
@@ -582,9 +523,6 @@ echo -n "$LD_FLAGS" > "$FLAGS_DIR/ld_flags"
 echo -n "$LD_SCRIPTS" > "$FLAGS_DIR/ld_scripts"
 echo -n "$AR_LIBS" > "$FLAGS_DIR/ld_libs"
 
-# Speichere verkürzte Includes für Debugging
-echo -n "$SHORTENED_INCLUDES" > "$FLAGS_DIR/shortened_includes"
-
 if [ -d "managed_components/espressif__esp32-camera/driver/private_include/" ]; then
 	cp -r "managed_components/espressif__esp32-camera/driver/private_include/cam_hal.h" "$AR_SDK/include/espressif__esp32-camera/driver/include/"
 fi