Merge branch 'master' of harrygodden.com:/home/fishladder

diff --combined build.sh
index a6a260a8ef77d16db94383b991df196187f0b1d9,c24169d30f577750c4fc9d3945672f565d78b7e3..c22ad791c750c60902445519645bcefc33ac33f0
--- 1/build.sh
--- 2/build.sh
+++ b/build.sh
@@@ -54,7 -54,6 +54,7 @@@ if [ "$compile_tools" = true ]; the
        mkdir tools -p
        gcc -Wall -Wstrict-aliasing=3 $lib $flags mdlcomp.c gl/glad.c -o tools/mdlcomp $libs -Wl,-rpath=./ $defines
        gcc -Wall -Wstrict-aliasing=3 $lib $flags fontcomp.c gl/glad.c -o tools/fontcomp $libs -Wl,-rpath=./ $defines
 +      gcc $lib qoiconv.c -std=c99 -O3 -o tools/qoiconv
  fi
  
  # Resources
@@@ -66,14 -65,6 +66,14 @@@ if [ "$compile_models" = true ]; the
        done
  fi
  
 +# Convert all png to qoi
 +echo "Compiling textures"
 +mkdir _temp_textures
 +for f in textures/*.png;
 +      do echo "-> qoi: $f";
 +      ./tools/qoiconv $f ./_temp_textures/"$(basename "$f" .png).qoi"
 +done
 +
  # Main build
  if [ "$do_build" = true ]; then
        gcc -Wall -Wstrict-aliasing=3 $lib $flags $src gl/glad.c -o $target $libs -Wl,-rpath=./ $defines
@@@ -92,11 -83,11 +92,12 @@@ if [[ "$OSTYPE" == "linux-gnu"* ]]; the
        mkdir build.linux/textures -p
        mkdir build.linux/sound -p
        mkdir build.linux/maps -p
+       mkdir build.linux/sav -p
  
        cp $target ./build.linux/$target
        cp ./steam/libsteam_api.so ./build.linux/libsteam_api.so
 -      cp -r ./textures/ ./build.linux/
 +      rm -r ./build.linux/textures
 +      mv ./_temp_textures/ ./build.linux/textures
        cp -r ./sound/ ./build.linux/
        cp -r ./maps/ ./build.linux/
  
@@@ -112,10 -103,10 +113,11 @@@ els
        mkdir build.win32/textures -p
        mkdir build.win32/sound -p
        mkdir build.win32/maps -p
+       mkdir build.win32/sav -p
        
        cp $target ./build.win32/$target
 -      cp -r ./textures/ ./build.win32/
 +      rm -r ./build.win32/textures
 +      mv ./_temp_textures/ ./build.win32/textures
        cp -r ./sound/ ./build.win32/
        cp -r ./maps/ ./build.win32/
        cp ./lib/glfw3.dll ./build.win32/glfw3.dll