@@ -1,7 +1,9 @@

 *.reu

-zig

-zig-dl

-emscripten

+toolchain-zig

+toolchain-zig-dl

+toolchain-emscripten

+toolchain-android

+toolchain-android-dl

 *.html

 *.js

 *.wasm

@@ -31,12 +31,12 @@ 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 ". zig/env.sh >/dev/null ; zig cc -I./zig/windows-msys2-mingw/include/ -I./zig/windows-msys2-mingw/include/SDL2 boxui.c -c -o boxui-windows.o -target x86_64-windows-gnu"

+	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"

 # boxui-html.o: html5

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

-	sh -c ". emscripten/env.sh ; emcc -g -Wall -s USE_SDL=2 -s USE_SDL_TTF=2 boxui.c -c -o boxui-html.o"

+	sh -c ". toolchain-emscripten/env.sh ; emcc -g -Wall -s USE_SDL=2 -s USE_SDL_TTF=2 boxui.c -c -o boxui-html.o"

 # boxui_demo_helloworld: linux

@@ -47,19 +47,18 @@ 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 ". zig/env.sh >/dev/null ; zig cc -I./zig/windows-msys2-mingw/include/ -I./zig/windows-msys2-mingw/include/SDL2 boxui_demo_helloworld.c -c -o boxui_demo_helloworld-windows.o -target x86_64-windows-gnu"

+	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"

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

-	sh -c ". zig/env.sh >/dev/null ; zig build-exe --subsystem windows boxui_demo_helloworld-windows.o boxui-windows.o boxui-icon.o -Lzig/windows-msys2-mingw/lib/ -Lzig/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"

+	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: html5

 boxui_demo_helloworld-html.o: boxui_demo_helloworld.c

-	sh -c ". emscripten/env.sh ; emcc -g -Wall -s USE_SDL=2 -s USE_SDL_TTF=2 boxui_demo_helloworld.c -c -o boxui_demo_helloworld-html.o"

+	sh -c ". toolchain-emscripten/env.sh ; emcc -g -Wall -s USE_SDL=2 -s USE_SDL_TTF=2 boxui_demo_helloworld.c -c -o boxui_demo_helloworld-html.o"

 boxui_demo_helloworld.html: boxui-html.template boxui-html.o boxui_demo_helloworld-html.o

-	sh -c ". emscripten/env.sh ; emcc boxui_demo_helloworld-html.o boxui-html.o -o boxui_demo_helloworld.html -s USE_SDL=2 -s USE_SDL_TTF=2 && sed s/PROGRAMNAME/boxui_demo_helloworld/g < boxui-html.template > boxui_demo_helloworld.html && zip -pr boxui_demo_helloworld-html.zip boxui_demo_helloworld.html boxui_demo_helloworld.js boxui_demo_helloworld.wasm"

-

+	sh -c ". toolchain-emscripten/env.sh ; emcc boxui_demo_helloworld-html.o boxui-html.o -o boxui_demo_helloworld.html -s USE_SDL=2 -s USE_SDL_TTF=2 && sed s/PROGRAMNAME/boxui_demo_helloworld/g < boxui-html.template > boxui_demo_helloworld.html && zip -pr boxui_demo_helloworld-html.zip boxui_demo_helloworld.html boxui_demo_helloworld.js boxui_demo_helloworld.wasm"

 clean:

 	rm -f *.o *.js *.html *.wasm *.exe *.ico *.rc \

deleted file mode 100755

@@ -1,24 +0,0 @@

-#!/bin/bash

-if [ -e emscripten ] ; then

-        echo "ERROR: An emscripten directory already exists, aborting install"

-        echo "NOTE: To upgrade the installation, use ./emscripten-upgrade.sh"

-        exit 1

-fi

-parentdir=$(pwd)

-mkdir -p emscripten

-cd emscripten

-git clone https://github.com/emscripten-core/emsdk.git

-cat > env.sh  <<'EOF'

-#!/bin/bash

-echo "Reminder: this script has to be used with source (.) instead of exec"

-EOF

-echo "export PATH=$parentdir/emscripten/emsdk:$parentdir/emscripten/emsdk/upstream/emscripten:\$PATH" >> env.sh

-echo "export EMSDK=$parentdir/emscripten/emsdk" >> env.sh

-chmod 755 env.sh

-cd ..

-./emscripten-update.sh

-echo ""

-echo "Installation complete."

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

-

-

new file mode 100755

@@ -0,0 +1,24 @@

+#!/bin/bash

+if [ -e toolchain-emscripten ] ; then

+        echo "ERROR: A toolchain-emscripten directory already exists, aborting install"

+        echo "NOTE: To upgrade the installation, use ./update-toolchain-emscripten.sh"

+        exit 1

+fi

+parentdir=$(pwd)

+mkdir -p toolchain-emscripten

+cd toolchain-emscripten

+git clone https://github.com/emscripten-core/emsdk.git

+cat > env.sh  <<'EOF'

+#!/bin/bash

+echo "Reminder: this script has to be used with source (.) instead of exec"

+EOF

+echo "export PATH=$parentdir/toolchain-emscripten/emsdk:$parentdir/toolchain-emscripten/emsdk/upstream/emscripten:\$PATH" >> env.sh

+echo "export EMSDK=$parentdir/toolchain-emscripten/emsdk" >> env.sh

+chmod 755 env.sh

+cd ..

+./update-toolchain-emscripten.sh

+echo ""

+echo "Installation complete."

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

+

+

similarity index 82%

rename from zig-setup.sh

rename to setup-toolchain-zig.sh

@@ -1,25 +1,25 @@

 #!/bin/bash

 zigbuild=zig-linux-x86_64-0.11.0-dev.514+4be1bb4aa.tar.xz

 zigversion=$(echo $zigbuild | cut -d '-' -f 4)

-if [ -e zig ] ; then

-        echo "ERROR: A zig directory already exists, aborting install"

+if [ -e toolchain-zig ] ; then

+        echo "ERROR: A toolchain-zig directory already exists, aborting install"

         exit 1

 fi

 parentdir=$(pwd)

-mkdir -p zig zig-dl

-cd zig

+mkdir -p toolchain-zig toolchain-zig-dl

+cd toolchain-zig

 # Zig install

-if [ ! -e ../zig-dl/$zigbuild ] ; then

-        (cd ../zig-dl && wget https://ziglang.org/builds/$zigbuild)

+if [ ! -e ../toolchain-zig-dl/$zigbuild ] ; then

+        (cd ../toolchain-zig-dl && wget https://ziglang.org/builds/$zigbuild)

 fi

-xz -dc <../zig-dl/$zigbuild | tar -xvf -

+xz -dc <../toolchain-zig-dl/$zigbuild | tar -xvf -

 ln -s ${zigbuild/.tar.xz/} zig-$zigversion

 cat > env.sh  <<'EOF'

 #!/bin/bash

 echo "Reminder: this script has to be used with source (.) instead of exec"

 EOF

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

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

 chmod 755 env.sh

 # msys2 install

 mkdir -p windows-msys2-mingw

@@ -95,16 +95,16 @@ https://mirror.msys2.org/msys/x86_64/msys2-w32api-headers-10.0.0.r16.g49a56d453-

 https://mirror.msys2.org/msys/x86_64/msys2-w32api-runtime-10.0.0.r16.g49a56d453-1-x86_64.pkg.tar.zst

 EOF

 for i in  $(cat deps.txt) ; do

-        if [ ! -e ../zig-dl/$(basename $i) ] ; then

-                (cd ../zig-dl && wget $i )

+        if [ ! -e ../toolchain-zig-dl/$(basename $i) ] ; then

+                (cd ../toolchain-zig-dl && wget $i )

         fi

 done

-for i in $(cd ../zig-dl && find . -maxdepth 1 -name "*.zst") ; do 

-         ( mkdir -p t ; cd t ; cat ../../zig-dl/$i | zstd -dc | tar -xvf - ; find . -maxdepth 1 -type d  -print | grep -v "^\.\$" | while read l ; do

-          (cd $l && tar -cf - . | (cd $parentdir/zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t ; done

-for i in $(cd ../zig-dl && find . -maxdepth 1 -name "*.xz") ; do 

-         ( mkdir -p t ; cd t ; cat ../../zig-dl/$i | xz -dc | tar -xvf - ; find . -maxdepth 1 -type d  -print | grep -v "^\.\$" | while read l ; do

-         (cd $l && tar -cf - . | (cd $parentdir/zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t ; done

+for i in $(cd ../toolchain-zig-dl && find . -maxdepth 1 -name "*.zst") ; do 

+         ( mkdir -p t ; cd t ; cat ../../toolchain-zig-dl/$i | zstd -dc | tar -xvf - ; find . -maxdepth 1 -type d  -print | grep -v "^\.\$" | while read l ; do

+          (cd $l && tar -cf - . | (cd $parentdir/toolchain-zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t ; done

+for i in $(cd ../toolchain-zig-dl && find . -maxdepth 1 -name "*.xz") ; do 

+         ( mkdir -p t ; cd t ; cat ../../toolchain-zig-dl/$i | xz -dc | tar -xvf - ; find . -maxdepth 1 -type d  -print | grep -v "^\.\$" | while read l ; do

+         (cd $l && tar -cf - . | (cd $parentdir/toolchain-zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t ; done

 cat > add-zst.sh <<'EOF'

 #!/bin/bash

 if [ "m$1" == "m" ] || [ "m$1" == "m--help" ] || [ ! -f "$1" ] ; then

@@ -114,7 +114,7 @@ fi

 i="$1"

 ( mkdir -p t ; cd t ; cat ../$i | zstd -dc | tar -xvf - ; find . -maxdepth 1 -type d  -print | grep -v "^\.\$" | while read l ; do

 EOF

-echo " (cd \$l && tar -cf - . | (cd $parentdir/zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t " >> add-zst.sh

+echo " (cd \$l && tar -cf - . | (cd $parentdir/toolchain-zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t " >> add-zst.sh

 cat > add-xz.sh <<'EOF'

 #!/bin/bash

 if [ "m$1" == "m" ] || [ "m$1" == "m--help" ] || [ ! -f "$1" ] ; then

@@ -124,7 +124,7 @@ fi

 i="$1"

 ( mkdir -p t ; cd t ; cat ../$i | xz -dc | tar -xvf - ; find . -maxdepth 1 -type d  -print | grep -v "^\.\$" | while read l ; do

 EOF

-echo " (cd $l && tar -cf - . | (cd $parentdir/zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t " >> add-xz.sh

+echo " (cd $l && tar -cf - . | (cd $parentdir/toolchain-zig/windows-msys2-mingw && tar -xvf - ) ) ; done ) ; rm -rf t " >> add-xz.sh

 chmod a+x add-xz.sh add-zst.sh

 # Check for windres

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

@@ -138,4 +138,4 @@ fi

 echo ""

 echo "Installation complete."

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

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

similarity index 69%

rename from emscripten-update.sh

rename to update-toolchain-emscripten.sh

@@ -1,5 +1,5 @@

 #!/bin/bash

-cd emscripten/emsdk

+cd toolchain-emscripten/emsdk

 git pull

 ./emsdk install latest

 ./emsdk activate latest