From 39732c1a27d45e7829e9ecdb7ec2345f484494b1 Mon Sep 17 00:00:00 2001 From: Anish Bhobe Date: Sat, 15 Jun 2024 18:29:29 +0200 Subject: [PATCH] Project reorganization. --- CMakeLists.txt | 3 ++- {aster_core => aster}/CMakeLists.txt | 13 ++++++------- {aster_core => aster}/config.h | 0 {aster_core => aster}/constants.h | 0 {aster_core => aster}/context.cpp | 0 {aster_core => aster}/context.h | 0 {aster_core => aster}/glfw_context.h | 0 {aster_core => aster}/global.cpp | 0 {aster_core => aster}/global.h | 0 {aster_core => aster}/logger.cpp | 0 {aster_core => aster}/logger.h | 0 {aster_core => aster}/window.cpp | 0 {aster_core => aster}/window.h | 0 triangle/CMakeLists.txt | 8 ++++++++ {aster_core => triangle}/aster.cpp | 9 ++++++--- 15 files changed, 22 insertions(+), 11 deletions(-) rename {aster_core => aster}/CMakeLists.txt (62%) rename {aster_core => aster}/config.h (100%) rename {aster_core => aster}/constants.h (100%) rename {aster_core => aster}/context.cpp (100%) rename {aster_core => aster}/context.h (100%) rename {aster_core => aster}/glfw_context.h (100%) rename {aster_core => aster}/global.cpp (100%) rename {aster_core => aster}/global.h (100%) rename {aster_core => aster}/logger.cpp (100%) rename {aster_core => aster}/logger.h (100%) rename {aster_core => aster}/window.cpp (100%) rename {aster_core => aster}/window.h (100%) create mode 100644 triangle/CMakeLists.txt rename {aster_core => triangle}/aster.cpp (67%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5df4c9f..1bb18ea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,4 +10,5 @@ set(CMAKE_CXX_EXTENSIONS OFF) set(CMAKE_CXX_FLAGS -Wall) -add_subdirectory("aster_core") +add_subdirectory("aster") +add_subdirectory("triangle") diff --git a/aster_core/CMakeLists.txt b/aster/CMakeLists.txt similarity index 62% rename from aster_core/CMakeLists.txt rename to aster/CMakeLists.txt index 78d006e..7eb0333 100644 --- a/aster_core/CMakeLists.txt +++ b/aster/CMakeLists.txt @@ -10,18 +10,17 @@ find_package(Vulkan REQUIRED) find_package(fmt CONFIG REQUIRED) find_package(VulkanMemoryAllocator CONFIG REQUIRED) -set(HEADER_FILES "constants.h" "config.h" "logger.h" "global.h" "context.h" "window.h") -set(SOURCE_FILES "logger.cpp" "global.cpp" "context.cpp" "window.cpp") +set(HEADER_FILES constants.h config.h logger.h global.h context.h window.h) +set(SOURCE_FILES logger.cpp global.cpp context.cpp window.cpp) -add_library(aster_core ${SOURCE_FILES} ${HEADER_FILES}) +add_library(aster_core STATIC ${SOURCE_FILES} ${HEADER_FILES}) set_property(TARGET aster_core PROPERTY CXX_STANDARD 20) -target_link_libraries(aster_core PRIVATE glm::glm-header-only) +target_include_directories(aster_core PUBLIC ${CMAKE_SOURCE_DIR}) + +target_link_libraries(aster_core PUBLIC glm::glm-header-only) target_link_libraries(aster_core PRIVATE glfw) target_include_directories(aster_core PRIVATE ${SCOTTT_DEBUGBREAK_INCLUDE_DIRS}) target_link_libraries(aster_core PRIVATE fmt::fmt) target_link_libraries(aster_core PRIVATE Vulkan::Vulkan Vulkan::Headers GPUOpen::VulkanMemoryAllocator) -add_executable(aster_exe "aster.cpp") -target_link_libraries(aster_exe PRIVATE aster_core) -target_link_libraries(aster_exe PRIVATE glm::glm-header-only) diff --git a/aster_core/config.h b/aster/config.h similarity index 100% rename from aster_core/config.h rename to aster/config.h diff --git a/aster_core/constants.h b/aster/constants.h similarity index 100% rename from aster_core/constants.h rename to aster/constants.h diff --git a/aster_core/context.cpp b/aster/context.cpp similarity index 100% rename from aster_core/context.cpp rename to aster/context.cpp diff --git a/aster_core/context.h b/aster/context.h similarity index 100% rename from aster_core/context.h rename to aster/context.h diff --git a/aster_core/glfw_context.h b/aster/glfw_context.h similarity index 100% rename from aster_core/glfw_context.h rename to aster/glfw_context.h diff --git a/aster_core/global.cpp b/aster/global.cpp similarity index 100% rename from aster_core/global.cpp rename to aster/global.cpp diff --git a/aster_core/global.h b/aster/global.h similarity index 100% rename from aster_core/global.h rename to aster/global.h diff --git a/aster_core/logger.cpp b/aster/logger.cpp similarity index 100% rename from aster_core/logger.cpp rename to aster/logger.cpp diff --git a/aster_core/logger.h b/aster/logger.h similarity index 100% rename from aster_core/logger.h rename to aster/logger.h diff --git a/aster_core/window.cpp b/aster/window.cpp similarity index 100% rename from aster_core/window.cpp rename to aster/window.cpp diff --git a/aster_core/window.h b/aster/window.h similarity index 100% rename from aster_core/window.h rename to aster/window.h diff --git a/triangle/CMakeLists.txt b/triangle/CMakeLists.txt new file mode 100644 index 0000000..449ca9c --- /dev/null +++ b/triangle/CMakeLists.txt @@ -0,0 +1,8 @@ +# CMakeList.txt ; CMake project for Aster Core + +cmake_minimum_required(VERSION 3.13) + +add_executable(aster_exe "aster.cpp") +add_dependencies(aster_exe aster_core) + +target_link_libraries(aster_exe PRIVATE aster_core) diff --git a/aster_core/aster.cpp b/triangle/aster.cpp similarity index 67% rename from aster_core/aster.cpp rename to triangle/aster.cpp index b322f75..cec0222 100644 --- a/aster_core/aster.cpp +++ b/triangle/aster.cpp @@ -1,12 +1,15 @@ -#include "constants.h" -#include "glfw_context.h" -#include "window.h" +#include "aster/constants.h" +#include "aster/glfw_context.h" +#include "aster/window.h" int main(int, char **) { GlfwContext *glfw = new GlfwContext(); Context *context = new Context("Aster", VERSION); Window *window = new Window("Aster1", context, { 640, 480 }); + while (window->poll()) { + } + delete window; delete context; delete glfw;