update submodule, some fixes

This commit is contained in:
matthew 2025-08-15 07:20:23 +10:00
parent b0a4bcb422
commit 89d2cb7407
4 changed files with 6 additions and 17 deletions

View File

@ -25,6 +25,8 @@ for shader in src/shaders/*.glsl; do
$shader_compiler $shader_flags $shader_stage $shader "${shader_out}${base_name}.spv" $shader_compiler $shader_flags $shader_stage $shader "${shader_out}${base_name}.spv"
done done
/bin/bash src/VulkanRenderer/build.sh build
if [ -x "$(command -v g++)" ]; then cpp_compiler="g++"; c_compiler="gcc"; if [ -x "$(command -v g++)" ]; then cpp_compiler="g++"; c_compiler="gcc";
elif [ -x "$(command -v clang++)" ]; then cpp_compiler="clang++"; c_compiler="clang"; elif [ -x "$(command -v clang++)" ]; then cpp_compiler="clang++"; c_compiler="clang";
else echo "Unable to find c++ cpp_compiler"; exit -1; fi; else echo "Unable to find c++ cpp_compiler"; exit -1; fi;
@ -34,19 +36,6 @@ elif [ -x "$(command -v lld)" ]; then linker_cmd="-fuse-ld=lld";
elif [ -x "$(command -v ld)" ]; then linker_cmd="-fuse-ld=ld"; elif [ -x "$(command -v ld)" ]; then linker_cmd="-fuse-ld=ld";
else echo "Unable to find c/c++ linker"; exit -1; fi; else echo "Unable to find c/c++ linker"; exit -1; fi;
# VMA
src="external/vma/vma.cpp"
flags="-std=c++20 -D_USE_MATH_DEFINES -Iexternal/vma -c -Wno-everything -static"
out="-o"
obj="build/vma.o"
lib="build/libvma.a"
if ! [ -f build/libvma.a ]; then
$cpp_compiler $flags $src $out $obj
ar rcs $lib $obj
rm $obj
fi
# XXHASH # XXHASH
src="external/xxhash/xxhash.c" src="external/xxhash/xxhash.c"
flags="-std=c99 -Wno-everything -Iexternal/xxhash -c -static" flags="-std=c99 -Wno-everything -Iexternal/xxhash -c -static"

@ -1 +1 @@
Subproject commit b6a93e91777f73445e50796324bd0737b0f3921f Subproject commit c6a92fa58a25fc204198bcd158e170847344d799

View File

@ -26,8 +26,8 @@ alias f64 = double;
alias b32 = uint; alias b32 = uint;
alias intptr = intptr_t; alias intptr = i64;
alias uintptr = uintptr_t; alias uintptr = u64;
alias usize = size_t; alias usize = size_t;

View File

@ -7,7 +7,7 @@ import alloc;
import core.simd; import core.simd;
import std.conv; import std.conv;
import std.string; import std.string;
j
struct DynSlice(T) struct DynSlice(T)
{ {
T[][] slices; T[][] slices;