header cleanup and more

Makefile

@@ -25,7 +25,7 @@ CFLAGS += -DPTK_VERSION_PATCH=0
 
 INCLUDE = include
 SRC = src
-CFLAGS += -I$(INCLUDE) -I$(SRC)
+CFLAGS += -I$(INCLUDE) -iquote$(SRC)
 
 BIN = target
 

include/ptk.h

@@ -1,9 +1,9 @@
 #ifndef PTK_PTK_H_
 #define PTK_PTK_H_
 
-#include <ptk_color.h>
-#include <ptk_list.h>
-#include <ptk_vec.h>
+#include "ptk_color.h"
+#include "ptk_list.h"
+#include "ptk_vec.h"
 
 #include <stdbool.h>
 #include <stdint.h>

src/ptk.c

@@ -1,14 +1,14 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk.h>
-#include <ptk_log.h>
-#include <ptk_list.h>
-#include <ptk_option.h>
+#include "ptk.h"
+#include "ptk_list.h"
+#include "ptk_log.h"
+#include "ptk_option.h"
 
-#include <ptk_vk/components.h>
-#include <ptk_vk/device.h>
-#include <ptk_vk/init.h>
-#include <ptk_vk/utils.h>
+#include "ptk_vk/components.h"
+#include "ptk_vk/device.h"
+#include "ptk_vk/init.h"
+#include "ptk_vk/utils.h"
 
 #include <vulkan/vulkan_core.h>
 #ifndef GLFW_INCLUDE_VULKAN

src/ptk_color.c

@@ -1,4 +1,4 @@
-#include <ptk_color.h>
+#include "ptk_color.h"
 
 #include <math.h>
 

src/ptk_list.c

@@ -1,6 +1,6 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_list.h>
+#include "ptk_list.h"
 
 #include <errno.h>
 #include <stdlib.h>

src/ptk_list.h

@@ -4,8 +4,8 @@
 #define PTK_PTK_LIST_H_
 
 #include <stdbool.h>
-#include <stdlib.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 #define PTK_LIST(T) struct PtkList_##T
 

src/ptk_log.c

@@ -1,6 +1,6 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_log.h>
+#include "ptk_log.h"
 
 #include <stdio.h>
 

src/ptk_vk/buffer.c

@@ -1,8 +1,8 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/buffer.h>
+#include "ptk_vk/buffer.h"
 
-#include <ptk_vk/utils.h>
+#include "ptk_vk/utils.h"
 
 #include <string.h>
 

src/ptk_vk/buffer.h

@@ -3,9 +3,9 @@
 #ifndef PTK_PTK_VK_BUFFER_H_
 #define PTK_PTK_VK_BUFFER_H_
 
-#include <vulkan/vulkan_core.h>
+#include "ptk_option.h"
 
-#include <ptk_option.h>
+#include <vulkan/vulkan_core.h>
 
 typedef struct {
     VkBuffer buffer;

src/ptk_vk/command_buffers.c

@@ -1,8 +1,8 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/command_buffers.h>
+#include "ptk_vk/command_buffers.h"
 
-#include <ptk_vk/utils.h>
+#include "ptk_vk/utils.h"
 
 PTK_OPTION(VkCommandBufferList) vk_allocate_command_buffers(VkDevice dev, VkCommandPool command_pool, uint32_t max_frames_in_flight) {
     VkCommandBufferList ret = PTK_LIST_NEW(VkCommandBuffer, max_frames_in_flight);

src/ptk_vk/command_buffers.h

@@ -3,10 +3,10 @@
 #ifndef PTK_PTK_VK_COMMAND_BUFFERS_H_
 #define PTK_PTK_VK_COMMAND_BUFFERS_H_
 
-#include <vulkan/vulkan_core.h>
+#include "ptk_list.h"
+#include "ptk_option.h"
 
-#include <ptk_list.h>
-#include <ptk_option.h>
+#include <vulkan/vulkan_core.h>
 
 PTK_LIST_DEFINE(VkCommandBuffer);
 typedef PTK_LIST(VkCommandBuffer) VkCommandBufferList;

src/ptk_vk/command_pool.c

@@ -1,9 +1,8 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/command_pool.h>
+#include "ptk_vk/command_pool.h"
 
-#include <ptk_vk/device.h>
-#include <ptk_vk/utils.h>
+#include "ptk_vk/utils.h"
 
 PTK_OPTION(VkCommandPool) vk_create_command_pool(VkDevice dev, uint32_t graphics_queue_family_index) {
     VkCommandPool ret;

src/ptk_vk/command_pool.h

@@ -3,9 +3,9 @@
 #ifndef PTK_PTK_VK_COMMAND_POOL_H_
 #define PTK_PTK_VK_COMMAND_POOL_H_
 
-#include <vulkan/vulkan_core.h>
+#include "ptk_option.h"
 
-#include <ptk_option.h>
+#include <vulkan/vulkan_core.h>
 
 PTK_OPTION_DEFINE(VkCommandPool);
 

src/ptk_vk/components.c

@@ -1,9 +1,9 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk.h>
-#include <ptk_log.h>
-#include <ptk_vk/components.h>
-#include <ptk_vk/init.h>
+#include "ptk_vk/components.h"
+#include "ptk_vk/init.h"
+
+#include "ptk.h"
 
 #include <GLFW/glfw3.h>
 #include <string.h>

src/ptk_vk/components.h

@@ -3,8 +3,8 @@
 #ifndef PTK_PTK_VK_COMPONENTS_H_
 #define PTK_PTK_VK_COMPONENTS_H_
 
-#include <ptk.h>
-#include <ptk_list.h>
+#include "ptk.h"
+#include "ptk_list.h"
 
 typedef struct {
     PtkPos pos;

src/ptk_vk/descriptors.c

@@ -1,8 +1,8 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/descriptors.h>
+#include "ptk_vk/descriptors.h"
 
-#include <ptk_vk/utils.h>
+#include "ptk_vk/utils.h"
 
 PTK_OPTION(VkDescriptorSetLayout) vk_create_descriptor_set_layout(VkDevice dev) {
     VkDescriptorSetLayout ret;

src/ptk_vk/descriptors.h

@@ -3,14 +3,13 @@
 #ifndef PTK_PTK_VK_DESCRIPTORS_H_
 #define PTK_PTK_VK_DESCRIPTORS_H_
 
+#include "ptk_vk/uniform_buffers.h"
+
+#include "ptk_list.h"
+#include "ptk_option.h"
+
 #include <vulkan/vulkan_core.h>
 
-#include <ptk_vk/uniform_buffers.h>
-
-#include <ptk.h>
-#include <ptk_list.h>
-#include <ptk_option.h>
-
 PTK_OPTION_DEFINE(VkDescriptorSetLayout);
 PTK_OPTION_DEFINE(VkDescriptorPool);
 PTK_LIST_DEFINE(VkDescriptorSet);

src/ptk_vk/device.c

@@ -1,19 +1,18 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/device.h>
+#include "ptk_vk/device.h"
 
-#include <ptk_vk/init.h>
-#include <ptk_vk/swapchain.h>
-#include <ptk_vk/utils.h>
+#include "ptk_vk/swapchain.h"
+#include "ptk_vk/utils.h"
+
+#include "ptk_array.h"
+#include "ptk_list.h"
+#include "ptk_log.h"
+#include "ptk_option.h"
 
 #include <stdbool.h>
 #include <string.h>
 
-#include <ptk_array.h>
-#include <ptk_list.h>
-#include <ptk_log.h>
-#include <ptk_option.h>
-
 VkQueue g_graphics_queue;
 VkQueue g_present_queue;
 

src/ptk_vk/device.h

@@ -3,14 +3,14 @@
 #ifndef PTK_PTK_VK_DEVICE_H_
 #define PTK_PTK_VK_DEVICE_H_
 
-#include <ptk_array.h>
-#include <ptk_option.h>
+// for PTK_ARRAY(constcharptr)
+#include "ptk_vk/instance.h"
+
+#include "ptk_array.h"
+#include "ptk_option.h"
 
 #include <vulkan/vulkan_core.h>
 
-// for PTK_ARRAY(constcharptr)
-#include <ptk_vk/instance.h>
-
 PTK_OPTION_DEFINE(uint32_t);
 
 typedef struct {

src/ptk_vk/init.c

@@ -1,24 +1,27 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/init.h>
+#include "ptk_vk/init.h"
 
-#include <ptk_vk/buffer.h>
-#include <ptk_vk/command_pool.h>
-#include <ptk_vk/components.h>
-#include <ptk_vk/descriptors.h>
-#include <ptk_vk/device.h>
-#include <ptk_vk/instance.h>
-#include <ptk_vk/physical_device.h>
-#include <ptk_vk/pipeline.h>
-#include <ptk_vk/render_pass.h>
-#include <ptk_vk/swapchain.h>
-#include <ptk_vk/uniform_buffers.h>
-#include <ptk_vk/utils.h>
+#include "ptk_vk/buffer.h"
+#include "ptk_vk/command_buffers.h"
+#include "ptk_vk/command_pool.h"
+#include "ptk_vk/components.h"
+#include "ptk_vk/descriptors.h"
+#include "ptk_vk/device.h"
+#include "ptk_vk/instance.h"
+#include "ptk_vk/physical_device.h"
+#include "ptk_vk/pipeline.h"
+#include "ptk_vk/render_pass.h"
+#include "ptk_vk/swapchain.h"
+#include "ptk_vk/sync_objects.h"
+#include "ptk_vk/uniform_buffers.h"
+#include "ptk_vk/utils.h"
+
+#include "ptk_array.h"
+#include "ptk_list.h"
+#include "ptk_log.h"
+#include "ptk_option.h"
 
-#include <ptk_log.h>
-#include <ptk_option.h>
-#include <ptk_array.h>
-#include <ptk_list.h>
 #include <stdio.h>
 #include <string.h>
 

src/ptk_vk/init.h

@@ -3,15 +3,14 @@
 #ifndef PTK_PTK_VK_INIT_H_
 #define PTK_PTK_VK_INIT_H_
 
+#include "ptk.h"
+
 #ifndef GLFW_INCLUDE_VULKAN
 #define GLFW_INCLUDE_VULKAN
 #endif
 #include <GLFW/glfw3.h>
-#include <ptk.h>
-#include <ptk_list.h>
 
-#include <ptk_vk/command_buffers.h>
-#include <ptk_vk/sync_objects.h>
+#include <stdbool.h>
 
 bool vk_init(GLFWwindow *window, const size_t width, const size_t height, const char *title, const PtkVersion version);
 

src/ptk_vk/instance.c

@@ -1,10 +1,10 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/instance.h>
+#include "ptk_vk/instance.h"
 
-#include <ptk_vk/utils.h>
+#include "ptk_vk/utils.h"
 
-#include <ptk_array.h>
+#include "ptk_array.h"
 
 #ifndef GLFW_INCLUDE_VULKAN
 #define GLFW_INCLUDE_VULKAN
@@ -86,4 +86,3 @@ PTK_OPTION(VkInstance) vk_instance_create(const char *title, const PtkVersion ve
 
     return PTK_OPTION_SOME(VkInstance, ret);
 }
-

src/ptk_vk/instance.h

@@ -3,11 +3,11 @@
 #ifndef PTK_PTK_VK_INSTANCE_H_
 #define PTK_PTK_VK_INSTANCE_H_
 
-#include <vulkan/vulkan_core.h>
+#include "ptk.h"
+#include "ptk_array.h"
+#include "ptk_option.h"
 
-#include <ptk.h>
-#include <ptk_array.h>
-#include <ptk_option.h>
+#include <vulkan/vulkan_core.h>
 
 PTK_OPTION_DEFINE(VkInstance);
 typedef const char *constcharptr;

src/ptk_vk/physical_device.c

@@ -1,8 +1,8 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/physical_device.h>
+#include "ptk_vk/physical_device.h"
 
-#include <ptk_log.h>
+#include "ptk_log.h"
 
 #include <vulkan/vulkan.h>
 

src/ptk_vk/physical_device.h

@@ -3,9 +3,9 @@
 #ifndef PTK_PTK_VK_PHYSICAL_DEVICE_H_
 #define PTK_PTK_VK_PHYSICAL_DEVICE_H_
 
-#include <vulkan/vulkan_core.h>
+#include "ptk_option.h"
 
-#include <ptk_option.h>
+#include <vulkan/vulkan_core.h>
 
 PTK_OPTION_DEFINE(VkPhysicalDevice);
 

src/ptk_vk/pipeline.c

@@ -1,15 +1,15 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/pipeline.h>
+#include "ptk_vk/pipeline.h"
 
-#include <ptk_vk/components.h>
-#include <ptk_vk/swapchain.h>
-#include <ptk_vk/utils.h>
+#include "ptk_vk/components.h"
+#include "ptk_vk/utils.h"
 
-#include <ptk_log.h>
+#include "ptk_array.h"
+#include "ptk_log.h"
 
-#include <errno.h>
-#include <stdio.h>
+#include "errno.h"
+#include "stdio.h"
 
 PTK_OPTION_DEFINE(VkShaderModule);
 PTK_ARRAY_DEFINE(VkVertexInputAttributeDescription);

src/ptk_vk/pipeline.h

@@ -3,11 +3,9 @@
 #ifndef PTK_PTK_VK_PIPELINE_H_
 #define PTK_PTK_VK_PIPELINE_H_
 
-#include <vulkan/vulkan_core.h>
+#include "ptk_option.h"
 
-#include <ptk.h>
-#include <ptk_array.h>
-#include <ptk_option.h>
+#include <vulkan/vulkan_core.h>
 
 typedef struct {
     VkPipeline pipeline;

src/ptk_vk/render_pass.c

@@ -1,10 +1,8 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/render_pass.h>
-#include <ptk_vk/swapchain.h>
+#include "ptk_vk/render_pass.h"
 
-#include <ptk_vk/device.h>
-#include <ptk_vk/utils.h>
+#include "ptk_vk/utils.h"
 
 PTK_OPTION(VkRenderPass) vk_create_render_pass(VkDevice dev, VkFormat format) {
     VkRenderPass ret;
@@ -62,4 +60,3 @@ PTK_OPTION(VkRenderPass) vk_create_render_pass(VkDevice dev, VkFormat format) {
 
     return PTK_OPTION_SOME(VkRenderPass, ret);
 }
-

src/ptk_vk/render_pass.h

@@ -3,11 +3,11 @@
 #ifndef PTK_PTK_VK_RENDER_PASS_H_
 #define PTK_PTK_VK_RENDER_PASS_H_
 
-#include <stdbool.h>
+#include "ptk_option.h"
 
 #include <vulkan/vulkan.h>
 
-#include <ptk_option.h>
+#include <stdbool.h>
 
 PTK_OPTION_DEFINE(VkRenderPass);
 

src/ptk_vk/swapchain.c

@@ -1,12 +1,10 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/swapchain.h>
+#include "ptk_vk/swapchain.h"
 
-#include <ptk_vk/physical_device.h>
-#include <ptk_vk/render_pass.h>
-#include <ptk_vk/utils.h>
+#include "ptk_vk/utils.h"
 
-#include <ptk_list.h>
+#include "ptk_list.h"
 
 #ifndef GLFW_INCLUDE_VULKAN
 #define GLFW_INCLUDE_VULKAN

src/ptk_vk/swapchain.h

@@ -3,14 +3,13 @@
 #ifndef PTK_PTK_VK_SWAPCHAIN_H_
 #define PTK_PTK_VK_SWAPCHAIN_H_
 
+#include "ptk_vk/device.h"
+
+#include "ptk_list.h"
+
 #include <vulkan/vulkan_core.h>
 #include <GLFW/glfw3.h>
 
-#include <ptk_vk/device.h>
-
-#include <ptk_list.h>
-#include <ptk_option.h>
-
 PTK_LIST_DEFINE(VkFramebuffer);
 
 PTK_LIST_DEFINE(VkSurfaceFormatKHR);

src/ptk_vk/sync_objects.c

@@ -1,8 +1,8 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/sync_objects.h>
+#include "ptk_vk/sync_objects.h"
 
-#include <ptk_vk/utils.h>
+#include "ptk_vk/utils.h"
 
 PTK_OPTION(SyncObjects) vk_create_sync_objects(VkDevice dev, uint32_t max_frames_in_flight) {
     SyncObjects ret = {
@@ -42,4 +42,3 @@ PTK_OPTION(SyncObjects) vk_create_sync_objects(VkDevice dev, uint32_t max_frames
     
     return PTK_OPTION_SOME(SyncObjects, ret);
 }
-

src/ptk_vk/sync_objects.h

@@ -3,10 +3,10 @@
 #ifndef PTK_PTK_VK_SYNC_OBJECTS_H_
 #define PTK_PTK_VK_SYNC_OBJECTS_H_
 
-#include <vulkan/vulkan_core.h>
+#include "ptk_list.h"
+#include "ptk_option.h"
 
-#include <ptk_list.h>
-#include <ptk_option.h>
+#include <vulkan/vulkan_core.h>
 
 PTK_LIST_DEFINE(VkSemaphore);
 PTK_LIST_DEFINE(VkFence);

src/ptk_vk/uniform_buffers.c

@@ -1,10 +1,10 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/uniform_buffers.h>
+#include "ptk_vk/uniform_buffers.h"
 
-#include <ptk_vk/buffer.h>
+#include "ptk_vk/buffer.h"
 
-#include <ptk_log.h>
+#include "ptk_log.h"
 
 PTK_OPTION(UniformBufferStuff) vk_create_uniform_buffers(VkDevice dev, VkPhysicalDevice physical_dev, uint32_t max_frames_in_flight) {
     const VkDeviceSize buffer_size = sizeof(UniformBufferObject);
@@ -37,4 +37,3 @@ PTK_OPTION(UniformBufferStuff) vk_create_uniform_buffers(VkDevice dev, VkPhysica
 
     return PTK_OPTION_SOME(UniformBufferStuff, ret);
 }
-

src/ptk_vk/uniform_buffers.h

@@ -3,11 +3,11 @@
 #ifndef PTK_PTK_VK_UNIFORM_BUFFERS_H_
 #define PTK_PTK_VK_UNIFORM_BUFFERS_H_
 
-#include <vulkan/vulkan_core.h>
+#include "ptk_list.h"
+#include "ptk_option.h"
+#include "ptk_vec.h"
 
-#include <ptk_list.h>
-#include <ptk_option.h>
-#include <ptk_vec.h>
+#include <vulkan/vulkan_core.h>
 
 PTK_LIST_DEFINE(VkBuffer);
 PTK_LIST_DEFINE(VkDeviceMemory);

src/ptk_vk/utils.c

@@ -1,6 +1,6 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <ptk_vk/utils.h>
+#include "ptk_vk/utils.h"
 
 const char *vk_result_string(VkResult res) {
     const char *str;

src/ptk_vk/utils.h

@@ -3,8 +3,9 @@
 #ifndef PTK_PTK_VK_UTILS_H_
 #define PTK_PTK_VK_UTILS_H_
 
+#include "ptk_log.h"
+
 #include <vulkan/vulkan_core.h>
-#include <ptk_log.h>
 
 const char *vk_result_string(VkResult res);
 

test/list.c

@@ -1,7 +1,8 @@
 // Copyright (jacekpoz 2024). Licensed under the EUPL-1.2 or later.
 
-#include <test.h>
-#include <ptk_list.h>
+#include "test.h"
+
+#include "ptk_list.h"
 
 PTK_LIST_DEFINE(uint32_t);