@@ -29,7 +29,7 @@ if [ "m\$2" = "m--help" ] ; then

         exit 1

 fi

 . "$parentdir/toolchain-zig/env.sh" >/dev/null

-exec zig cc "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/w32api/" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/SDL2" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/SDL" "\$@" -target x86_64-windows-gnu

+exec zig cc "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/w32api/" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/SDL2" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/SDL" "-I$parentdir/toolchain-zig/sdl3-windows/SDL3/include" "-I$parentdir/toolchain-zig/sdl3-windows/SDL_ttf/include" "\$@" -target x86_64-windows-gnu

 EOF

 chmod 755 compile.sh

 cat > compile-cpp.sh  <<EOF

@@ -39,7 +39,7 @@ if [ "m$2" = "m--help" ] ; then

         exit 1

 fi

 . "$parentdir/toolchain-zig/env.sh" >/dev/null

-exec zig c++ "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/w32api/" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/SDL2" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/SDL" "\$@" -target x86_64-windows-gnu

+exec zig c++ "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/w32api/" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/SDL2" "-I$parentdir/toolchain-zig/windows-msys2-mingw/include/SDL" "-I$parentdir/toolchain-zig/sdl3-windows/SDL3/include" "-I$parentdir/toolchain-zig/sdl3-windows/SDL_ttf/include" "\$@" -target x86_64-windows-gnu

 EOF

 chmod 755 compile-cpp.sh

@@ -66,7 +66,7 @@ shift

 convert "\$icon" "\${icon/.png/-buildiconobject.ico}" && \

  echo "1 ICON \"\${icon/.png/-buildiconobject.ico}\"" > "\${icon/.png/-buildiconobject.rc}" && \

  x86_64-w64-mingw32-windres --preprocessor /usr/bin/cpp "\${icon/.png/-buildiconobject.rc}" "\${icon/.png/-buildiconobject.o}" && \

- zig build-exe --subsystem windows "\$@" \${icon/.png/-buildiconobject.o} -L$parentdir/toolchain-zig/windows-msys2-mingw/lib/ -L$parentdir/toolchain-zig/windows-msys2-mingw/lib/w32api -lSDL2 -lSDL2main -lSDL2_ttf -lfreetype -lgdi32 -lwinmm -lsetupapi -lmincore -lwindowsapp -limm32 -lversion -lgraphite2 -lpng -lbrotlidec -lbrotlicommon -lharfbuzz -lstdc++ -lbz2 -lz --name \$name -target x86_64-windows-gnu && rm \${name}.lib \${name}.pdb

+ zig build-exe --subsystem windows "\$@" \${icon/.png/-buildiconobject.o} -L$parentdir/toolchain-zig/windows-msys2-mingw/lib/ -L$parentdir/toolchain-zig/windows-msys2-mingw/lib/w32api $parentdir/toolchain-zig/sdl3-windows/libSDL3.dll.a $parentdir/toolchain-zig/sdl3-windows/libSDL3_ttf.dll.a $parentdir/toolchain-zig/sdl3-windows/libfreetype.a -lgdi32 -lwinmm -lsetupapi -lmincore -lwindowsapp -limm32 -lversion -lgraphite2 -lpng -lbrotlidec -lbrotlicommon -lharfbuzz -lstdc++ -lbz2 -lz --name \$name -target x86_64-windows-gnu && rm \${name}.lib \${name}.pdb

 res=\$?

 rm "\${icon/.png/-buildiconobject.ico}" "\${icon/.png/-buildiconobject.rc}" "\${icon/.png/-buildiconobject.o}"

 if [ \$tmpicon -eq 1 ] ; then rm "\$icon" ; fi

@@ -186,34 +186,46 @@ chmod a+x add-xz.sh add-zst.sh

 cd ..

 # Check for windres

 if ! which x86_64-w64-mingw32-windres >/dev/null 2>/dev/null; then

-        echo "Please, install windres manually using your distribution, i.e.:"                

-        echo "sudo apt-get install binutils-mingw-w64-x86-64"

+        echo "Please, install windres manually using your distribution, i.e.:" >> tooldchain-zig/error.log

+        echo "sudo apt-get install binutils-mingw-w64-x86-64" >> tooldchain-zig/error.log

 fi

 if ! which convert >/dev/null 2>/dev/null; then

-        echo "Please, install imagemagick manually using your distribution, i.e.:"                

-        echo "sudo apt-get install imagemagick"

+        echo "Please, install imagemagick manually using your distribution, i.e.:" >> tooldchain-zig/error.log

+        echo "sudo apt-get install imagemagick" >> tooldchain-zig/error.log

 fi

 # SDL3 for mingw

-mkdir -p sdl3-windows

-cat > sdl3-windows/setup.sh <<'SeTuPeOf'

+mkdir -p "$parentdir/toolchain-zig/sdl3-windows"

+cd "$parentdir/toolchain-zig/sdl3-windows"

+cat > setup.sh <<'SeTuPeOf'

 #!/bin/bash

 #SDL3

-if [ ! -e SDL3-devel-3.1.3-mingw.tar.xz ] ; then

-	wget https://github.com/libsdl-org/SDL/releases/download/preview-3.1.3/SDL3-devel-3.1.3-mingw.tar.xz

+if [ ! -e ../../toolchain-zig-dl/SDL3-preview-3.1.6.tgz ] ; then

+	wget https://github.com/libsdl-org/SDL/archive/refs/tags/preview-3.1.6.tar.gz -O ../../toolchain-zig-dl/SDL3-preview-3.1.6.tgz

 fi

-xz -d < SDL3-devel-3.1.3-mingw.tar.xz | tar -xvf -

-cp ./SDL3-3.1.3/x86_64-w64-mingw32/bin/SDL3.dll .

+tar -xvzf ../../toolchain-zig-dl/SDL3-preview-3.1.6.tgz

+mv SDL3-3.1.6 SDL3

+cd SDL3

+ln -s PARENTDIR/toolchain-zig/compile.sh x86_64-w64-mingw32-gcc

+ln -s PARENTDIR/toolchain-zig/compile-cpp.sh x86_64-w64-mingw32-g++

+cat >> src/winresrc.h <<'EOF'

+#define LANG_ENGLISH    0x09

+#define SUBLANG_ENGLISH_US      0x01

+EOF

+PATH=$(pwd):$PATH cmake -S . -B build -DBUILD_SHARED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=build-scripts/cmake-toolchain-mingw64-x86_64.cmake -DCMAKE_MAKE_PROGRAM=make -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ && cmake --build build

+cd ..

+cp ./SDL3/build/SDL3.dll .

+cp ./SDL3/build/libSDL3.dll.a .

 #SDL3_ttf

-rm -rf SDL_ttf

-if [ ! -e SDL_ttf.tgz ] ; then

-	git clone --recurse-submodules -j4 https://github.com/libsdl-org/SDL_ttf.git

-	tar -cf SDL_ttf.tgz SDL_ttf

+if [ -e ../../toolchain-zig-dl/SDL_ttf.tgz ] ; then

+	tar -xf ../../toolchain-zig-dl/SDL_ttf.tgz

 else

-	tar -xf SDL_ttf.tgz

+	git clone --recurse-submodules -j4 https://github.com/libsdl-org/SDL_ttf.git

+	tar -cf ../../toolchain-zig-dl/SDL_ttf.tgz SDL_ttf

 fi

 cd SDL_ttf

-ln -s ~/Programacion/sources/boxui/toolchain-zig/compile.sh x86_64-w64-mingw32-gcc

-ln -s ~/Programacion/sources/boxui/toolchain-zig/compile-cpp.sh x86_64-w64-mingw32-g++

+sed -i "s/SDL_REQUIRED_VERSION 3\.1\.5/SDL_REQUIRED_VERSION 3.1.6/g" CMakeLists.txt

+ln -s PARENTDIR/toolchain-zig/compile.sh x86_64-w64-mingw32-gcc

+ln -s PARENTDIR/toolchain-zig/compile-cpp.sh x86_64-w64-mingw32-g++

 mkdir -p build/external/freetype/include

 cat >> build/external/freetype/include/windows.h <<'EOF'

 #define	VS_FF_DEBUG	0x01L

@@ -259,18 +271,22 @@ index f96d5087..b2028178 100644

  }

 EOF

 # revert patch https://discourse.libsdl.org/t/sdl-ttf-use-sdl-stepbackutf8/54854

-( patch -R -p1 < ./freetype_Use_SDL_StepBackUTF8.patch )

+#( patch -R -p1 < ./freetype_Use_SDL_StepBackUTF8.patch )

 sed -i "s/vendored_default FALSE/vendored_default TRUE/g" CMakeLists.txt

-PATH=$(pwd):$PATH cmake -S . -B build -DBUILD_SHARED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=build-scripts/cmake-toolchain-mingw64-x86_64.cmake -DCMAKE_MAKE_PROGRAM=make -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DSDL3_DIR=/home/bit/Programacion/sources/boxui/sdl3-windows/SDL3-3.1.3/x86_64-w64-mingw32/lib/cmake/SDL3/ && cmake --build build

+PATH=$(pwd):$PATH cmake -S . -B build -DBUILD_SHARED_LIBS=ON -DCMAKE_TOOLCHAIN_FILE=build-scripts/cmake-toolchain-mingw64-x86_64.cmake -DCMAKE_MAKE_PROGRAM=make -DCMAKE_C_COMPILER=x86_64-w64-mingw32-gcc -DCMAKE_CXX_COMPILER=x86_64-w64-mingw32-g++ -DSDL3_DIR=PARENTDIR/toolchain-zig/sdl3-windows/SDL3/build && cmake --build build

 cd ..

 cp SDL_ttf/build/SDL3_ttf.dll .

 cp SDL_ttf/build/libSDL3_ttf.dll.a .

 cp SDL_ttf/build/external/freetype/libfreetype.a .

 SeTuPeOf

-cd sdl3-windows

+sed -i "s#PARENTDIR#$parentdir#g" setup.sh

 chmod a+x setup.sh

 ./setup.sh

 cd ..

+# Show errors if tehre is an error.log file

+if [ -e toolchain-zig/error.log ] ; then

+	cat toolchain-zig/error.log

+fi

 # Success message

 echo ""

 echo "Installation complete."