compatibilité vscode

gcc/macos_wine_wrappers/fontconvert.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+# Lance le fontconvert.out Windows du projet via le Wine embarqué dans TouchGFX.app
+# (TouchGFX Designer pour macOS est une appli Wineskin - c'est le meme mecanisme que ST utilise).
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+
+WINE64="/Applications/STMicroelectronics/TouchGFX.app/Contents/SharedSupport/wine/bin/wine64"
+TOOL="$PROJECT_ROOT/Appli/Middlewares/ST/touchgfx/framework/tools/fontconvert/build/win/fontconvert.out"
+
+if [ ! -x "$WINE64" ]; then
+    echo "Wine introuvable ($WINE64). TouchGFX.app (Designer) doit etre installe dans /Applications/STMicroelectronics." >&2
+    exit 1
+fi
+
+export DYLD_FALLBACK_LIBRARY_PATH="/Applications/STMicroelectronics/TouchGFX.app/Contents/Frameworks:/Applications/STMicroelectronics/TouchGFX.app/Contents/SharedSupport/wine/lib"
+
+"$WINE64" "$TOOL" "$@" 2>/dev/null

gcc/macos_wine_wrappers/imageconvert.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+# Lance l'imageconvert.out Windows du projet via le Wine embarqué dans TouchGFX.app
+# (TouchGFX Designer pour macOS est une appli Wineskin - c'est le meme mecanisme que ST utilise).
+set -e
+
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)"
+
+WINE64="/Applications/STMicroelectronics/TouchGFX.app/Contents/SharedSupport/wine/bin/wine64"
+TOOL="$PROJECT_ROOT/Appli/Middlewares/ST/touchgfx/framework/tools/imageconvert/build/win/imageconvert.out"
+
+if [ ! -x "$WINE64" ]; then
+    echo "Wine introuvable ($WINE64). TouchGFX.app (Designer) doit etre installe dans /Applications/STMicroelectronics." >&2
+    exit 1
+fi
+
+export DYLD_FALLBACK_LIBRARY_PATH="/Applications/STMicroelectronics/TouchGFX.app/Contents/Frameworks:/Applications/STMicroelectronics/TouchGFX.app/Contents/SharedSupport/wine/lib"
+
+"$WINE64" "$TOOL" "$@" 2>/dev/null

gcc/makefile_appli

@@ -121,6 +121,11 @@ os_source_files += \
 ifeq ($(UNAME), Linux)
 imageconvert_executable := $(touchgfx_path)/framework/tools/imageconvert/build/linux/imageconvert.out
 fontconvert_executable := $(touchgfx_path)/framework/tools/fontconvert/build/linux/fontconvert.out
+else ifeq ($(UNAME), Darwin)
+# Pas de binaire macOS pour imageconvert/fontconvert (Windows/Linux only) : on passe par le
+# Wine embarque dans TouchGFX.app (TouchGFX Designer pour macOS est une appli Wineskin).
+imageconvert_executable := gcc/macos_wine_wrappers/imageconvert.sh
+fontconvert_executable := gcc/macos_wine_wrappers/fontconvert.sh
 else
 imageconvert_executable := $(touchgfx_path)/framework/tools/imageconvert/build/win/imageconvert.out
 fontconvert_executable := $(touchgfx_path)/framework/tools/fontconvert/build/win/fontconvert.out
@@ -184,6 +189,7 @@ cpp_compiler_options += \
 
 linker_options += \
 	--specs=nosys.specs \
+	--specs=nano.specs \
 	-Os \
 	-Wl,--gc-sections -static \
 	-Wl,--print-memory-usage \
@@ -300,10 +306,21 @@ board_include_paths := \
 	$(Drivers_path)/CMSIS/Device/ST/STM32H7RSxx/Include \
 	$(Drivers_path)/STM32H7RSxx_HAL_Driver/Inc \
 	$(Drivers_path)/CMSIS/RTOS2/Include \
+	$(Drivers_path)/STM32H7RSxx_BSP/STM32H7S78-DK \
+	$(Drivers_path)/STM32H7RSxx_BSP/Components/wm8904 \
     Appli/Core/Inc \
 	$(gpu2d_path)/TouchGFXNema/include \
 	$(gpu2d_path)/NemaGFX/include
 
+board_c_files += \
+	$(Drivers_path)/STM32H7RSxx_BSP/STM32H7S78-DK/stm32h7s78_discovery_audio.c \
+	$(Drivers_path)/STM32H7RSxx_BSP/STM32H7S78-DK/stm32h7s78_discovery_bus.c \
+	$(Drivers_path)/STM32H7RSxx_BSP/STM32H7S78-DK/stm32h7s78_discovery.c \
+	$(Drivers_path)/STM32H7RSxx_BSP/Components/wm8904/wm8904.c \
+	$(Drivers_path)/STM32H7RSxx_BSP/Components/wm8904/wm8904_reg.c \
+	$(Drivers_path)/STM32H7RSxx_HAL_Driver/Src/stm32h7rsxx_hal_mdf.c \
+	$(Drivers_path)/STM32H7RSxx_HAL_Driver/Src/stm32h7rsxx_hal_i2s.c
+
 
 asm_source_files := \
 	gcc/startup_stm32h7s7l8hxh_appli.s
@@ -466,4 +483,4 @@ _clean_:
 	# Create directory to avoid error if it does not exist
 	@mkdir -p $(asset_root_path)
 	# Remove assets folder if it is empty (i.e. no gui_generated folder)
-	@rmdir --ignore-fail-on-non-empty $(asset_root_path)
+	@rmdir $(asset_root_path) 2>/dev/null || true

gcc/nul

@@ -0,0 +1 @@
+find: /c/ST/STM32CubeCLT/STM32CubeCLT//STMicroelectronics/STM32Cube/STM32CubeProgrammer/bin/STM32_Programmer_CLI.exe: No such file or directory