diff --git a/LICENSE b/LICENSE index eaf8ee4..08cd0c4 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ MIT License - Copyright (c) 2022-2023 kbz_8 + Copyright (c) 2022-2024 kbz_8 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/test/42_logo.png b/example/42_logo.png similarity index 100% rename from test/42_logo.png rename to example/42_logo.png diff --git a/example/Test b/example/Test new file mode 100755 index 0000000..2a36f9c Binary files /dev/null and b/example/Test differ diff --git a/test/build.sh b/example/build.sh similarity index 100% rename from test/build.sh rename to example/build.sh diff --git a/test/font.ttf b/example/font.ttf similarity index 100% rename from test/font.ttf rename to example/font.ttf diff --git a/test/main.c b/example/main.c similarity index 100% rename from test/main.c rename to example/main.c diff --git a/test/run.sh b/example/run.sh similarity index 100% rename from test/run.sh rename to example/run.sh diff --git a/scripts/fetch_dependencies.sh b/scripts/fetch_dependencies.sh index bedebfc..d40d1b2 100644 --- a/scripts/fetch_dependencies.sh +++ b/scripts/fetch_dependencies.sh @@ -3,13 +3,23 @@ # Update volk rm -f ../third_party/volk.c rm -f ../third_party/volk.h -wget https://api.github.com/repos/zeux/volk/zipball/1.3.270 -O volk.zip +tag_name=$(curl -sL https://api.github.com/repos/zeux/Volk/releases/latest | jq -r '.tag_name') +wget https://api.github.com/repos/zeux/volk/zipball/$tag_name -O volk.zip unzip -o volk.zip -d ../third_party/ mv ../third_party/zeux-volk*/volk.h ../third_party mv ../third_party/zeux-volk*/volk.c ../third_party rm -rf ../third_party/zeux-volk* rm volk.zip +# Update VMA +rm -f ../third_party/vma.h +tag_name=$(curl -sL https://api.github.com/repos/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/releases/latest | jq -r '.tag_name') +wget https://api.github.com/repos/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/zipball/$tag_name -O vma.zip +unzip -o vma.zip -d ../third_party/ +mv ../third_party/GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator*/include/vk_mem_alloc.h ../third_party/vma.h +rm -rf ../third_party/GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator* +rm vma.zip + # Update Vulkan headers rm -rf ../third_party/vulkan rm -rf ../third_party/vk_video diff --git a/valgrind.supp b/valgrind.supp index d746267..d81f800 100644 --- a/valgrind.supp +++ b/valgrind.supp @@ -1,4 +1,4 @@ -{ + name Memcheck:Leak fun:*alloc diff --git a/xmake.lua b/xmake.lua index 885bf81..0a71c0c 100644 --- a/xmake.lua +++ b/xmake.lua @@ -6,13 +6,12 @@ -- By: maldavid +#+ +:+ +#+ -- -- +#+#+#+#+#+ +#+ -- -- Created: 2023/12/07 15:21:38 by kbz_8 #+# #+# -- --- Updated: 2023/12/07 15:21:38 by kbz_8 ### ########.fr -- +-- Updated: 2024/01/02 23:40:20 by kbz_8 ### ########.fr -- -- -- -------------------------------------------------------------------------------- -- Global settings -add_requires("vulkan-headers") add_requires("libsdl", {configs = { sdlmain = false }}) add_rules("mode.debug", "mode.release") @@ -55,7 +54,7 @@ target("mlx") add_files("src/**.cpp") - add_packages("libsdl", "vulkan-headers") + add_packages("libsdl") if is_mode("debug") then add_defines("DEBUG") @@ -71,7 +70,7 @@ target("Test") add_deps("mlx") - add_files("test/main.c") + add_files("example/main.c") add_defines("SDL_MAIN_HANDLED")