fix up build script

diff --git a/build.sh b/build.sh
index c22ad791c750c60902445519645bcefc33ac33f0..485a8c170626e76b7bb2902d1c0a3c4413d9dd0d 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -5,12 +5,15 @@ target="fishladder"
 lib="-I. -L./lib -L./"
 libs="-lGL -lglfw -lX11 -lXxf86vm -lXrandr -lm -lpthread -lXi -ldl" # -l:steam/libsteam_api.so"
 flags="-fsanitize=address -ggdb3 -Wno-unused-function -DNO_STEAM"
+build_dir="build.linux"
 
 if [[ "$OSTYPE" != "linux-gnu"* ]]; then
        echo "Operating system is not GNU/Linux, windows will be assumed."
+
        target="fishladder.exe"
        libs="-lglfw3 -lopengl32 -lm -mwindows"
        flags="-ggdb3 -Wno-unused-function -DNO_STEAM"
+       build_dir="build.win32"
 fi
 
 run_after=false
@@ -86,47 +89,23 @@ if [ "$do_build" = true ]; then
        echo "Build succeeded"
 fi
 
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-       # Directories to initialize
-       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
+mkdir $build_dir/cfg -p
+mkdir $build_dir/textures -p
+mkdir $build_dir/sound -p
+mkdir $build_dir/maps -p
+mkdir $build_dir/sav -p
 
-       cp $target ./build.linux/$target
-       cp ./steam/libsteam_api.so ./build.linux/libsteam_api.so
-       rm -r ./build.linux/textures
-       mv ./_temp_textures/ ./build.linux/textures
-       cp -r ./sound/ ./build.linux/
-       cp -r ./maps/ ./build.linux/
+cp $target $build_dir/$target
+cp ./steam/libsteam_api.so $build_dir/libsteam_api.so
+rm -r $build_dir/textures
+mv ./_temp_textures/ $build_dir/textures
+cp -r ./sound/ $build_dir
+cp -r ./maps/ $build_dir
 
-       if [ "$run_after" = true ]; then
-               echo "Playing"
+if [ "$run_after" = true ]; then
+       echo "Playing"
 
-               cd ./build.linux/
-               ./$target
-               cd ./../
-       fi
-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
-       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
-               echo "Playing"
-               
-               cd ./build.win32/
-               ./$target
-               cd ./../
-       fi
+       cd $build_dir
+       ./$target
+       cd ./../
 fi