From f8c8c6de005a8c25efa1fdb31389e127637f3a98 Mon Sep 17 00:00:00 2001 From: Benedikt Galbavy Date: Thu, 11 Jan 2024 08:30:49 +0100 Subject: [PATCH] structural changes --- CMakeLists.txt | 12 ++++++++---- {src => include}/ColliderComponent.h | 0 {src => include}/Components.h | 0 {src => include}/Defines.h | 0 {src => include}/ECS.h | 0 {src => include}/Game.h | 0 {src => include}/GameObject.h | 0 {src => include}/KeyboardController.h | 0 {src => include}/Map.h | 0 {src => include}/SpriteComponent.h | 0 {src => include}/TextureDict.h | 0 {src => include}/TextureManager.h | 0 {src => include}/TileComponent.h | 0 {src => include}/TransformComponent.h | 0 {src => include}/Vector2D.h | 0 15 files changed, 8 insertions(+), 4 deletions(-) rename {src => include}/ColliderComponent.h (100%) rename {src => include}/Components.h (100%) rename {src => include}/Defines.h (100%) rename {src => include}/ECS.h (100%) rename {src => include}/Game.h (100%) rename {src => include}/GameObject.h (100%) rename {src => include}/KeyboardController.h (100%) rename {src => include}/Map.h (100%) rename {src => include}/SpriteComponent.h (100%) rename {src => include}/TextureDict.h (100%) rename {src => include}/TextureManager.h (100%) rename {src => include}/TileComponent.h (100%) rename {src => include}/TransformComponent.h (100%) rename {src => include}/Vector2D.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c6b3d10..8865b00 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,16 +1,21 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.15) project(SDL_Minigame) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) +set(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) +set(PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) +set(PROJECT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) add_subdirectory(lib/SDL EXCLUDE_FROM_ALL) add_subdirectory(lib/SDL_image EXCLUDE_FROM_ALL) +add_subdirectory(lib/zlib EXCLUDE_FROM_ALL) add_subdirectory(lib/libpng EXCLUDE_FROM_ALL) include_directories( + ${PROJECT_INCLUDE_DIR} ${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS} ${ZLIB_IMAGE_INCLUDE_DIRS} @@ -20,11 +25,10 @@ file(GLOB_RECURSE SOURCES src/*.cpp) add_executable(${PROJECT_NAME} ${SOURCES}) target_link_libraries(${PROJECT_NAME} PRIVATE - SDL2 + SDL2::SDL2 SDL2_image ${ZLIB_LIBRARY} ${PNG_LIBRARIES} ) -# Copy assets (if any) to build directory during build -file(COPY src/assets DESTINATION ${CMAKE_BINARY_DIR}) \ No newline at end of file +file(COPY ${PROJECT_SOURCE_DIR}/assets DESTINATION ${PROJECT_BINARY_DIR}) \ No newline at end of file diff --git a/src/ColliderComponent.h b/include/ColliderComponent.h similarity index 100% rename from src/ColliderComponent.h rename to include/ColliderComponent.h diff --git a/src/Components.h b/include/Components.h similarity index 100% rename from src/Components.h rename to include/Components.h diff --git a/src/Defines.h b/include/Defines.h similarity index 100% rename from src/Defines.h rename to include/Defines.h diff --git a/src/ECS.h b/include/ECS.h similarity index 100% rename from src/ECS.h rename to include/ECS.h diff --git a/src/Game.h b/include/Game.h similarity index 100% rename from src/Game.h rename to include/Game.h diff --git a/src/GameObject.h b/include/GameObject.h similarity index 100% rename from src/GameObject.h rename to include/GameObject.h diff --git a/src/KeyboardController.h b/include/KeyboardController.h similarity index 100% rename from src/KeyboardController.h rename to include/KeyboardController.h diff --git a/src/Map.h b/include/Map.h similarity index 100% rename from src/Map.h rename to include/Map.h diff --git a/src/SpriteComponent.h b/include/SpriteComponent.h similarity index 100% rename from src/SpriteComponent.h rename to include/SpriteComponent.h diff --git a/src/TextureDict.h b/include/TextureDict.h similarity index 100% rename from src/TextureDict.h rename to include/TextureDict.h diff --git a/src/TextureManager.h b/include/TextureManager.h similarity index 100% rename from src/TextureManager.h rename to include/TextureManager.h diff --git a/src/TileComponent.h b/include/TileComponent.h similarity index 100% rename from src/TileComponent.h rename to include/TileComponent.h diff --git a/src/TransformComponent.h b/include/TransformComponent.h similarity index 100% rename from src/TransformComponent.h rename to include/TransformComponent.h diff --git a/src/Vector2D.h b/include/Vector2D.h similarity index 100% rename from src/Vector2D.h rename to include/Vector2D.h