@@ -12,18 +12,6 @@ notosans_regular_ttf.c: fonts/NotoSans-Regular.ttf

 notosans_regular_ttf.h: fonts/NotoSans-Regular.ttf

 	(cd fonts && xxd -i NotoSans-Regular.ttf | sed "s/^\(.*[^ ]\) *=.*/extern \1\;/g" | grep extern | tr A-Z a-z ) > notosans_regular_ttf.h

-

-# windows build icon

-

-boxui-icon.ico: boxui-icon_256x256.png

-	convert boxui-icon_256x256.png boxui-icon.ico

-

-boxui-icon.rc: boxui-icon.ico

-	echo "1 ICON \"boxui-icon.ico\"" > boxui-icon.rc

-

-boxui-icon.o: boxui-icon.rc boxui-icon.ico

-	x86_64-w64-mingw32-windres --preprocessor /usr/bin/cpp boxui-icon.rc boxui-icon.o

-

 # boxui.o: linux

 boxui.o: boxui.c boxui.h notosans_regular_ttf.c notosans_regular_ttf.h

@@ -31,7 +19,7 @@ boxui.o: boxui.c boxui.h notosans_regular_ttf.c notosans_regular_ttf.h

 # boxui-windows.o: windows

 boxui-windows.o: boxui.c boxui.h notosans_regular_ttf.c notosans_regular_ttf.h

-	sh -c ". toolchain-zig/env.sh >/dev/null ; zig cc -I./toolchain-zig/windows-msys2-mingw/include/ -I./toolchain-zig/windows-msys2-mingw/include/SDL2 boxui.c -c -o boxui-windows.o -target x86_64-windows-gnu"

+	toolchain-zig/compile.sh boxui.c -c -o boxui-windows.o

 # boxui-html.o: html5

@@ -47,10 +35,10 @@ boxui_demo_helloworld: boxui.o boxui_demo_helloworld.o

 # boxui_demo_helloworld: windows

 boxui_demo_helloworld-windows.o: boxui_demo_helloworld.c boxui.h

-	sh -c ". toolchain-zig/env.sh >/dev/null ; zig cc -I./toolchain-zig/windows-msys2-mingw/include/ -I./toolchain-zig/windows-msys2-mingw/include/SDL2 boxui_demo_helloworld.c -c -o boxui_demo_helloworld-windows.o -target x86_64-windows-gnu"

+	toolchain-zig/compile.sh boxui_demo_helloworld.c -c -o boxui_demo_helloworld-windows.o

-boxui_demo_helloworld.exe: boxui-icon.o boxui-windows.o boxui_demo_helloworld-windows.o

-	sh -c ". toolchain-zig/env.sh >/dev/null ; zig build-exe --subsystem windows boxui_demo_helloworld-windows.o boxui-windows.o boxui-icon.o -Ltoolchain-zig/windows-msys2-mingw/lib/ -Ltoolchain-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 boxui_demo_helloworld -target x86_64-windows-gnu && rm boxui_demo_helloworld.lib boxui_demo_helloworld.pdb"

+boxui_demo_helloworld.exe: boxui-icon_256x256.png boxui-windows.o boxui_demo_helloworld-windows.o

+	toolchain-zig/link.sh -icon boxui-icon_256x256.png boxui_demo_helloworld.exe boxui-windows.o boxui_demo_helloworld-windows.o

 # boxui_demo_helloworld: html5

@@ -21,6 +21,47 @@ echo "Reminder: this script has to be used with source (.) instead of exec"

 EOF

 echo "export PATH=\$PATH:$parentdir/toolchain-zig/zig-$zigversion" >> env.sh

 chmod 755 env.sh

+# Convenience scripts

+cat > compile.sh  <<EOF

+#!/bin/bash

+if [ ! -e "\$1" ] || [ "m\$2" = "m" ] ; then

+        echo "Syntax: \$0 source.c -c -o result.o [flags]"

+        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/SDL2" "\$@" -target x86_64-windows-gnu

+EOF

+chmod 755 compile.sh

+cat > link.sh  <<EOF

+#!/bin/bash

+tmpicon=0

+if [ "m\$1" = "m-icon" ] ; then

+        shift

+        icon="\$1"

+        shift

+else

+        tmpicon=1

+        icon=\$(mktemp -p . --suffix=.png)

+        convert -size 256x256 xc:white \$icon

+fi

+if [ "\${icon/.png/}" = "\$icon" ] || [ "\${1/.exe/}" = "\$1" ] || [ ! -e "\$2" ] ; then

+        echo "Syntax: \$0 [-icon myicon.png] result.exe source1.o [source2.o [...]"

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

+        exit 1

+fi

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

+name="\${1/.exe/}"

+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

+res=\$?

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

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

+exit \$res

+EOF

+chmod 755 link.sh

 # msys2 install

 mkdir -p windows-msys2-mingw

 cat > deps.txt <<'EOF'

@@ -139,3 +180,4 @@ fi

 echo ""

 echo "Installation complete."

 echo "To use the zig toolchain, first include env.sh with \". toolchain-zig/env.sh\""

+echo "( alternative: use toolchain-zig/compile.sh and toolchain-zig/link.sh )"