X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;ds=sidebyside;f=build.sh;h=eb741bfdba289a4dd1400616cb1aad027be955a5;hb=1f0e3292c021e8263716e5f4544a1efcedf3f03d;hp=fad620190cce6a31a17c14c4b1dc5b418e1efe7f;hpb=47941822dae18a018c985847b052e70214a3ccc6;p=carveJwlIkooP6JGAAIwe30JlM.git diff --git a/build.sh b/build.sh index fad6201..eb741bf 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" @@ -29,7 +29,7 @@ _options_release="-O3 -DVG_RELEASE" # Compiler lines # ============================================================================== -_warnings="-Wall -Wno-unused-function -Wno-unused-variable" +_warnings="-Wall -Wno-unused-function -Wno-unused-variable -Wno-unused-command-line-argument -Wno-unused-but-set-variable" _include="-I. -I./vg/dep -I./vg/src" _library="-L. -L./vg/dep/glfw -L./vg/dep/steam" _epilogue="-Wl,-rpath=./" @@ -94,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 @@ -188,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)