X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=build.sh;h=0228534080bc83d6aee13c56acbaa198e065ba1d;hb=bdac014448b6ec968fe645f1581f321144f07dba;hp=0b958721a60804f5854e175e43499f9694830e6a;hpb=8bc80dc83f08a7016f1057f82d00727a2e417fa3;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/build.sh b/build.sh index 0b95872..0228534 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,7 @@ # Compiler Presets # ============================================================================== -_linux_compiler="gcc -std=c99 -D_REENTRANT" +_linux_compiler="clang -std=c99 -D_REENTRANT" _linux_linkgraphics="-lGL -lglfw3 -lX11 -lXxf86vm -lXrandr -lm -pthread -lXi -ldl" _linux_asan="-fsanitize=address" _linux_linksteam="-lsteam_api" @@ -23,7 +23,7 @@ _windows_asan="" _windows_linksteam="vg/dep/steam/steam_api.dll" _windows_folder="bin/win32" -_options_debugmode="-O0 -ggdb3 -fno-omit-frame-pointer" +_options_debugmode="-O0 -ggdb3 -fno-omit-frame-pointer -rdynamic" _options_release="-O3 -DVG_RELEASE" # Compiler lines @@ -57,7 +57,7 @@ compile_miniaudio(){ # TODO run_game(){ cd $_linux_folder - ./skaterift + ./skaterift --samples=4 cd ./../ } @@ -73,6 +73,10 @@ delay_run_game(){ } link_content(){ + unlink $1/textures + unlink $1/models + unlink $1/sound + ln -srf bin/content/textures $1/textures ln -srf bin/content/models $1/models ln -srf bin/content/sound $1/sound @@ -90,6 +94,14 @@ vg_command(){ _linux_options="$_linux_asan $_options_debugmode" _windows_options="$_windows_asan $_options_debugmode" ;; + ltools) + _compiler=$_linux_compiler + _options=$_linux_options + _folder=$_linux_folder + _ext="" + vg_compile_tools + + ;; game) titleit "Creating Linux build" mkdir -p $_linux_folder/cfg @@ -184,13 +196,24 @@ vg_command(){ ./bin/linux/tools/qoiconv $f $dest done ;; + sounds) + titleit "Compiling sounds" + mkdir -p ./bin/content/textures + + for f in ./sound_src/*.wav + do + dest=./bin/content/sounds/"$(basename "$f" .wav).44100.ima_adpcm" + ./bin/linux/tools/audcomp $f $dest + done + ;; + content) logit "Copying content" mkdir -p ./bin/content/models mkdir -p ./bin/content/sound cp ./models_src/* ./bin/content/models/ - cp ./sound_src/* ./bin/content/sound/ + #cp ./sound_src/* ./bin/content/sound/ ;; all) @@ -224,6 +247,11 @@ vg_command(){ test) run_game ;; + gdb) + cd $_linux_folder + gdb -tui ./skaterift + cd ./../ + ;; testserver) run_server ;;