diff --git a/justfile b/justfile index 358809c..f9270a9 100644 --- a/justfile +++ b/justfile @@ -42,7 +42,7 @@ build: vendor bear -a -- {{CC}} -g -c {{VK_FLAGS}} {{VK_SDK}}/include/volk/volk.c -o {{BUILDDIR}}/volk.o bear -a -- {{CC}} -g -c {{VK_FLAGS}} src/prism/rhi/pr_rhi.c -o {{BUILDDIR}}/pr_rhi.o bear -a -- {{CC}} -g -c {{VK_FLAGS}} src/prism/rhi/vulkan/pr_rhi_vk.c -o {{BUILDDIR}}/pr_rhi_vk.o - bear -a -- {{CC}} -g -c src/wapp/wapp.c -o {{BUILDDIR}}/wapp.o + bear -a -- {{CC}} -g -c src/vendor/wapp/wapp.c -o {{BUILDDIR}}/wapp.o bear -a -- {{CXX}} -g -c {{VK_FLAGS}} -Wno-nullability-completeness -DVK_NO_PROTOTYPES \ {{APP_INC}} \ src/main.cpp \ diff --git a/src/prism/rhi/pr_rhi_types.h b/src/prism/rhi/pr_rhi_types.h index ff26745..fc8e69d 100644 --- a/src/prism/rhi/pr_rhi_types.h +++ b/src/prism/rhi/pr_rhi_types.h @@ -7,7 +7,7 @@ #ifndef PR_RHI_TYPES_H #define PR_RHI_TYPES_H -#include "../../wapp/wapp.h" +#include "../../vendor/wapp/wapp.h" #define PR_RHI_LOD_CLAMP_NONE 1000.0f diff --git a/src/wapp/base/array/array.c b/src/vendor/wapp/base/array/array.c similarity index 100% rename from src/wapp/base/array/array.c rename to src/vendor/wapp/base/array/array.c diff --git a/src/wapp/base/array/array.h b/src/vendor/wapp/base/array/array.h similarity index 100% rename from src/wapp/base/array/array.h rename to src/vendor/wapp/base/array/array.h diff --git a/src/wapp/base/dbl_list/dbl_list.c b/src/vendor/wapp/base/dbl_list/dbl_list.c similarity index 100% rename from src/wapp/base/dbl_list/dbl_list.c rename to src/vendor/wapp/base/dbl_list/dbl_list.c diff --git a/src/wapp/base/dbl_list/dbl_list.h b/src/vendor/wapp/base/dbl_list/dbl_list.h similarity index 100% rename from src/wapp/base/dbl_list/dbl_list.h rename to src/vendor/wapp/base/dbl_list/dbl_list.h diff --git a/src/wapp/base/mem/allocator/mem_allocator.c b/src/vendor/wapp/base/mem/allocator/mem_allocator.c similarity index 100% rename from src/wapp/base/mem/allocator/mem_allocator.c rename to src/vendor/wapp/base/mem/allocator/mem_allocator.c diff --git a/src/wapp/base/mem/allocator/mem_allocator.h b/src/vendor/wapp/base/mem/allocator/mem_allocator.h similarity index 100% rename from src/wapp/base/mem/allocator/mem_allocator.h rename to src/vendor/wapp/base/mem/allocator/mem_allocator.h diff --git a/src/wapp/base/mem/utils/mem_utils.c b/src/vendor/wapp/base/mem/utils/mem_utils.c similarity index 100% rename from src/wapp/base/mem/utils/mem_utils.c rename to src/vendor/wapp/base/mem/utils/mem_utils.c diff --git a/src/wapp/base/mem/utils/mem_utils.h b/src/vendor/wapp/base/mem/utils/mem_utils.h similarity index 100% rename from src/wapp/base/mem/utils/mem_utils.h rename to src/vendor/wapp/base/mem/utils/mem_utils.h diff --git a/src/wapp/base/queue/queue.c b/src/vendor/wapp/base/queue/queue.c similarity index 100% rename from src/wapp/base/queue/queue.c rename to src/vendor/wapp/base/queue/queue.c diff --git a/src/wapp/base/queue/queue.h b/src/vendor/wapp/base/queue/queue.h similarity index 100% rename from src/wapp/base/queue/queue.h rename to src/vendor/wapp/base/queue/queue.h diff --git a/src/wapp/base/strings/str8/str8.c b/src/vendor/wapp/base/strings/str8/str8.c similarity index 100% rename from src/wapp/base/strings/str8/str8.c rename to src/vendor/wapp/base/strings/str8/str8.c diff --git a/src/wapp/base/strings/str8/str8.h b/src/vendor/wapp/base/strings/str8/str8.h similarity index 100% rename from src/wapp/base/strings/str8/str8.h rename to src/vendor/wapp/base/strings/str8/str8.h diff --git a/src/wapp/base/wapp_base.c b/src/vendor/wapp/base/wapp_base.c similarity index 100% rename from src/wapp/base/wapp_base.c rename to src/vendor/wapp/base/wapp_base.c diff --git a/src/wapp/base/wapp_base.h b/src/vendor/wapp/base/wapp_base.h similarity index 100% rename from src/wapp/base/wapp_base.h rename to src/vendor/wapp/base/wapp_base.h diff --git a/src/wapp/common/aliases/aliases.h b/src/vendor/wapp/common/aliases/aliases.h similarity index 100% rename from src/wapp/common/aliases/aliases.h rename to src/vendor/wapp/common/aliases/aliases.h diff --git a/src/wapp/common/assert/assert.h b/src/vendor/wapp/common/assert/assert.h similarity index 100% rename from src/wapp/common/assert/assert.h rename to src/vendor/wapp/common/assert/assert.h diff --git a/src/wapp/common/misc/misc_utils.h b/src/vendor/wapp/common/misc/misc_utils.h similarity index 100% rename from src/wapp/common/misc/misc_utils.h rename to src/vendor/wapp/common/misc/misc_utils.h diff --git a/src/wapp/common/platform/platform.h b/src/vendor/wapp/common/platform/platform.h similarity index 100% rename from src/wapp/common/platform/platform.h rename to src/vendor/wapp/common/platform/platform.h diff --git a/src/wapp/common/wapp_common.h b/src/vendor/wapp/common/wapp_common.h similarity index 100% rename from src/wapp/common/wapp_common.h rename to src/vendor/wapp/common/wapp_common.h diff --git a/src/wapp/log/log.c b/src/vendor/wapp/log/log.c similarity index 100% rename from src/wapp/log/log.c rename to src/vendor/wapp/log/log.c diff --git a/src/wapp/log/log.h b/src/vendor/wapp/log/log.h similarity index 100% rename from src/wapp/log/log.h rename to src/vendor/wapp/log/log.h diff --git a/src/wapp/log/wapp_log.c b/src/vendor/wapp/log/wapp_log.c similarity index 100% rename from src/wapp/log/wapp_log.c rename to src/vendor/wapp/log/wapp_log.c diff --git a/src/wapp/log/wapp_log.h b/src/vendor/wapp/log/wapp_log.h similarity index 100% rename from src/wapp/log/wapp_log.h rename to src/vendor/wapp/log/wapp_log.h diff --git a/src/wapp/oldnames.h b/src/vendor/wapp/oldnames.h similarity index 100% rename from src/wapp/oldnames.h rename to src/vendor/wapp/oldnames.h diff --git a/src/wapp/os/allocators/arena/mem_arena.c b/src/vendor/wapp/os/allocators/arena/mem_arena.c similarity index 100% rename from src/wapp/os/allocators/arena/mem_arena.c rename to src/vendor/wapp/os/allocators/arena/mem_arena.c diff --git a/src/wapp/os/allocators/arena/mem_arena.h b/src/vendor/wapp/os/allocators/arena/mem_arena.h similarity index 100% rename from src/wapp/os/allocators/arena/mem_arena.h rename to src/vendor/wapp/os/allocators/arena/mem_arena.h diff --git a/src/wapp/os/allocators/arena/mem_arena_allocator.c b/src/vendor/wapp/os/allocators/arena/mem_arena_allocator.c similarity index 100% rename from src/wapp/os/allocators/arena/mem_arena_allocator.c rename to src/vendor/wapp/os/allocators/arena/mem_arena_allocator.c diff --git a/src/wapp/os/allocators/arena/mem_arena_allocator.h b/src/vendor/wapp/os/allocators/arena/mem_arena_allocator.h similarity index 100% rename from src/wapp/os/allocators/arena/mem_arena_allocator.h rename to src/vendor/wapp/os/allocators/arena/mem_arena_allocator.h diff --git a/src/wapp/os/cpath/cpath.c b/src/vendor/wapp/os/cpath/cpath.c similarity index 100% rename from src/wapp/os/cpath/cpath.c rename to src/vendor/wapp/os/cpath/cpath.c diff --git a/src/wapp/os/cpath/cpath.h b/src/vendor/wapp/os/cpath/cpath.h similarity index 100% rename from src/wapp/os/cpath/cpath.h rename to src/vendor/wapp/os/cpath/cpath.h diff --git a/src/wapp/os/file/file.c b/src/vendor/wapp/os/file/file.c similarity index 100% rename from src/wapp/os/file/file.c rename to src/vendor/wapp/os/file/file.c diff --git a/src/wapp/os/file/file.h b/src/vendor/wapp/os/file/file.h similarity index 100% rename from src/wapp/os/file/file.h rename to src/vendor/wapp/os/file/file.h diff --git a/src/wapp/os/file/posix/file_posix.c b/src/vendor/wapp/os/file/posix/file_posix.c similarity index 100% rename from src/wapp/os/file/posix/file_posix.c rename to src/vendor/wapp/os/file/posix/file_posix.c diff --git a/src/wapp/os/file/posix/file_posix.h b/src/vendor/wapp/os/file/posix/file_posix.h similarity index 100% rename from src/wapp/os/file/posix/file_posix.h rename to src/vendor/wapp/os/file/posix/file_posix.h diff --git a/src/wapp/os/file/win/file_win.c b/src/vendor/wapp/os/file/win/file_win.c similarity index 100% rename from src/wapp/os/file/win/file_win.c rename to src/vendor/wapp/os/file/win/file_win.c diff --git a/src/wapp/os/file/win/file_win.h b/src/vendor/wapp/os/file/win/file_win.h similarity index 100% rename from src/wapp/os/file/win/file_win.h rename to src/vendor/wapp/os/file/win/file_win.h diff --git a/src/wapp/os/mem/mem_os.c b/src/vendor/wapp/os/mem/mem_os.c similarity index 100% rename from src/wapp/os/mem/mem_os.c rename to src/vendor/wapp/os/mem/mem_os.c diff --git a/src/wapp/os/mem/mem_os.h b/src/vendor/wapp/os/mem/mem_os.h similarity index 100% rename from src/wapp/os/mem/mem_os.h rename to src/vendor/wapp/os/mem/mem_os.h diff --git a/src/wapp/os/mem/mem_os_ops.h b/src/vendor/wapp/os/mem/mem_os_ops.h similarity index 100% rename from src/wapp/os/mem/mem_os_ops.h rename to src/vendor/wapp/os/mem/mem_os_ops.h diff --git a/src/wapp/os/mem/posix/mem_os_posix.c b/src/vendor/wapp/os/mem/posix/mem_os_posix.c similarity index 100% rename from src/wapp/os/mem/posix/mem_os_posix.c rename to src/vendor/wapp/os/mem/posix/mem_os_posix.c diff --git a/src/wapp/os/mem/posix/mem_os_posix.h b/src/vendor/wapp/os/mem/posix/mem_os_posix.h similarity index 100% rename from src/wapp/os/mem/posix/mem_os_posix.h rename to src/vendor/wapp/os/mem/posix/mem_os_posix.h diff --git a/src/wapp/os/mem/win/mem_os_win.c b/src/vendor/wapp/os/mem/win/mem_os_win.c similarity index 100% rename from src/wapp/os/mem/win/mem_os_win.c rename to src/vendor/wapp/os/mem/win/mem_os_win.c diff --git a/src/wapp/os/mem/win/mem_os_win.h b/src/vendor/wapp/os/mem/win/mem_os_win.h similarity index 100% rename from src/wapp/os/mem/win/mem_os_win.h rename to src/vendor/wapp/os/mem/win/mem_os_win.h diff --git a/src/wapp/os/shell/commander/commander.c b/src/vendor/wapp/os/shell/commander/commander.c similarity index 100% rename from src/wapp/os/shell/commander/commander.c rename to src/vendor/wapp/os/shell/commander/commander.c diff --git a/src/wapp/os/shell/commander/commander.h b/src/vendor/wapp/os/shell/commander/commander.h similarity index 100% rename from src/wapp/os/shell/commander/commander.h rename to src/vendor/wapp/os/shell/commander/commander.h diff --git a/src/wapp/os/shell/commander/commander_output.h b/src/vendor/wapp/os/shell/commander/commander_output.h similarity index 100% rename from src/wapp/os/shell/commander/commander_output.h rename to src/vendor/wapp/os/shell/commander/commander_output.h diff --git a/src/wapp/os/shell/commander/posix/commander_posix.c b/src/vendor/wapp/os/shell/commander/posix/commander_posix.c similarity index 100% rename from src/wapp/os/shell/commander/posix/commander_posix.c rename to src/vendor/wapp/os/shell/commander/posix/commander_posix.c diff --git a/src/wapp/os/shell/commander/win/commander_win.c b/src/vendor/wapp/os/shell/commander/win/commander_win.c similarity index 100% rename from src/wapp/os/shell/commander/win/commander_win.c rename to src/vendor/wapp/os/shell/commander/win/commander_win.c diff --git a/src/wapp/os/shell/termcolour/posix/termcolour_posix.c b/src/vendor/wapp/os/shell/termcolour/posix/termcolour_posix.c similarity index 100% rename from src/wapp/os/shell/termcolour/posix/termcolour_posix.c rename to src/vendor/wapp/os/shell/termcolour/posix/termcolour_posix.c diff --git a/src/wapp/os/shell/termcolour/termcolour.c b/src/vendor/wapp/os/shell/termcolour/termcolour.c similarity index 100% rename from src/wapp/os/shell/termcolour/termcolour.c rename to src/vendor/wapp/os/shell/termcolour/termcolour.c diff --git a/src/wapp/os/shell/termcolour/termcolour.h b/src/vendor/wapp/os/shell/termcolour/termcolour.h similarity index 100% rename from src/wapp/os/shell/termcolour/termcolour.h rename to src/vendor/wapp/os/shell/termcolour/termcolour.h diff --git a/src/wapp/os/shell/termcolour/terminal_colours.h b/src/vendor/wapp/os/shell/termcolour/terminal_colours.h similarity index 100% rename from src/wapp/os/shell/termcolour/terminal_colours.h rename to src/vendor/wapp/os/shell/termcolour/terminal_colours.h diff --git a/src/wapp/os/shell/termcolour/win/termcolour_win.c b/src/vendor/wapp/os/shell/termcolour/win/termcolour_win.c similarity index 100% rename from src/wapp/os/shell/termcolour/win/termcolour_win.c rename to src/vendor/wapp/os/shell/termcolour/win/termcolour_win.c diff --git a/src/wapp/os/shell/utils/shell_utils.h b/src/vendor/wapp/os/shell/utils/shell_utils.h similarity index 100% rename from src/wapp/os/shell/utils/shell_utils.h rename to src/vendor/wapp/os/shell/utils/shell_utils.h diff --git a/src/wapp/os/wapp_os.c b/src/vendor/wapp/os/wapp_os.c similarity index 100% rename from src/wapp/os/wapp_os.c rename to src/vendor/wapp/os/wapp_os.c diff --git a/src/wapp/os/wapp_os.h b/src/vendor/wapp/os/wapp_os.h similarity index 100% rename from src/wapp/os/wapp_os.h rename to src/vendor/wapp/os/wapp_os.h diff --git a/src/wapp/prng/wapp_prng.c b/src/vendor/wapp/prng/wapp_prng.c similarity index 100% rename from src/wapp/prng/wapp_prng.c rename to src/vendor/wapp/prng/wapp_prng.c diff --git a/src/wapp/prng/wapp_prng.h b/src/vendor/wapp/prng/wapp_prng.h similarity index 100% rename from src/wapp/prng/wapp_prng.h rename to src/vendor/wapp/prng/wapp_prng.h diff --git a/src/wapp/prng/xorshift/xorshift.c b/src/vendor/wapp/prng/xorshift/xorshift.c similarity index 100% rename from src/wapp/prng/xorshift/xorshift.c rename to src/vendor/wapp/prng/xorshift/xorshift.c diff --git a/src/wapp/prng/xorshift/xorshift.h b/src/vendor/wapp/prng/xorshift/xorshift.h similarity index 100% rename from src/wapp/prng/xorshift/xorshift.h rename to src/vendor/wapp/prng/xorshift/xorshift.h diff --git a/src/wapp/testing/tester/tester.c b/src/vendor/wapp/testing/tester/tester.c similarity index 100% rename from src/wapp/testing/tester/tester.c rename to src/vendor/wapp/testing/tester/tester.c diff --git a/src/wapp/testing/tester/tester.h b/src/vendor/wapp/testing/tester/tester.h similarity index 100% rename from src/wapp/testing/tester/tester.h rename to src/vendor/wapp/testing/tester/tester.h diff --git a/src/wapp/testing/wapp_testing.c b/src/vendor/wapp/testing/wapp_testing.c similarity index 100% rename from src/wapp/testing/wapp_testing.c rename to src/vendor/wapp/testing/wapp_testing.c diff --git a/src/wapp/testing/wapp_testing.h b/src/vendor/wapp/testing/wapp_testing.h similarity index 100% rename from src/wapp/testing/wapp_testing.h rename to src/vendor/wapp/testing/wapp_testing.h diff --git a/src/wapp/uuid/uuid.c b/src/vendor/wapp/uuid/uuid.c similarity index 100% rename from src/wapp/uuid/uuid.c rename to src/vendor/wapp/uuid/uuid.c diff --git a/src/wapp/uuid/uuid.h b/src/vendor/wapp/uuid/uuid.h similarity index 100% rename from src/wapp/uuid/uuid.h rename to src/vendor/wapp/uuid/uuid.h diff --git a/src/wapp/uuid/wapp_uuid.c b/src/vendor/wapp/uuid/wapp_uuid.c similarity index 100% rename from src/wapp/uuid/wapp_uuid.c rename to src/vendor/wapp/uuid/wapp_uuid.c diff --git a/src/wapp/uuid/wapp_uuid.h b/src/vendor/wapp/uuid/wapp_uuid.h similarity index 100% rename from src/wapp/uuid/wapp_uuid.h rename to src/vendor/wapp/uuid/wapp_uuid.h diff --git a/src/wapp/wapp.c b/src/vendor/wapp/wapp.c similarity index 100% rename from src/wapp/wapp.c rename to src/vendor/wapp/wapp.c diff --git a/src/wapp/wapp.h b/src/vendor/wapp/wapp.h similarity index 100% rename from src/wapp/wapp.h rename to src/vendor/wapp/wapp.h