updating license year, fixing fetch dependencies script, adding VMA a…

…uto update, removing useless dependency in xmake build
seekrs · Jan 2, 2024 · ea87c32 · ea87c32
1 parent 67bfc73
commit ea87c32
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 7 deletions.
diff --git 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 → example/42_logo.png b/test/42_logo.png → example/42_logo.png
diff --git a/example/Test b/example/Test
diff --git a/test/build.sh → example/build.sh b/test/build.sh → example/build.sh
diff --git a/test/font.ttf → example/font.ttf b/test/font.ttf → example/font.ttf
diff --git a/test/main.c → example/main.c b/test/main.c → example/main.c
diff --git a/test/run.sh → example/run.sh b/test/run.sh → example/run.sh
diff --git 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
@@ -1,4 +1,4 @@
-{
+
    name
    Memcheck:Leak
    fun:*alloc

diff --git a/xmake.lua b/xmake.lua
@@ -6,13 +6,12 @@
 --   By: maldavid <kbz_8.dev@akel-engine.com>       +#+  +:+       +#+        --
 --                                                +#+#+#+#+#+   +#+           --
 --   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")