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

[fishladder.git] / build.sh

diff --git a/build.sh b/build.sh
index 9acfd368af55f6fde749dff7598d3e200089d5e9..c22ad791c750c60902445519645bcefc33ac33f0 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -21,7 +21,7 @@ compile_models=false
 while (( "$#" )); do
        case $1 in
                -r|--release) 
-                       flags="-O3"
+                       flags="-O3 -Wno-unused-function -DNO_STEAM"
                        echo "Release mode" 
                ;;
                -p|--play)
@@ -54,6 +54,7 @@ if [ "$compile_tools" = true ]; then
        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
@@ -65,6 +66,14 @@ if [ "$compile_models" = true ]; then
        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
@@ -82,11 +91,15 @@ if [[ "$OSTYPE" == "linux-gnu"* ]]; then
        mkdir build.linux/cfg -p
        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/
 
        if [ "$run_after" = true ]; then
                echo "Playing"
@@ -99,10 +112,14 @@ else
        mkdir build.win32/cfg -p
        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
        
        if [ "$run_after" = true ]; then