From c816ec582fed0a1c796ebd87b6ca9ef7a8dd4268 Mon Sep 17 00:00:00 2001 From: Benedikt Galbavy Date: Thu, 11 Jan 2024 09:31:13 +0100 Subject: [PATCH] light restructure --- .gitmodules | 16 ++++++++-------- CMakeLists.txt | 14 +++++++------- README.md | 1 + {src/assets => assets}/Map.aseprite | Bin {src/assets => assets}/MapNew.aseprite | Bin {src/assets => assets}/cat.png | Bin {src/assets => assets}/chicken_neutral.png | Bin .../chicken_neutral_knight.png | Bin {src/assets => assets}/cow.png | Bin {src/assets => assets}/dirt.png | Bin {src/assets => assets}/grass.png | Bin {src/assets => assets}/stone.png | Bin {src/assets => assets}/water.png | Bin {src/assets => assets}/water1.ase | Bin {src/assets => assets}/water1.png | Bin {lib => extern}/SDL | 0 {lib => extern}/SDL_image | 0 {lib => extern}/libpng | 0 {lib => extern}/zlib | 0 19 files changed, 16 insertions(+), 15 deletions(-) rename {src/assets => assets}/Map.aseprite (100%) rename {src/assets => assets}/MapNew.aseprite (100%) rename {src/assets => assets}/cat.png (100%) rename {src/assets => assets}/chicken_neutral.png (100%) rename {src/assets => assets}/chicken_neutral_knight.png (100%) rename {src/assets => assets}/cow.png (100%) rename {src/assets => assets}/dirt.png (100%) rename {src/assets => assets}/grass.png (100%) rename {src/assets => assets}/stone.png (100%) rename {src/assets => assets}/water.png (100%) rename {src/assets => assets}/water1.ase (100%) rename {src/assets => assets}/water1.png (100%) rename {lib => extern}/SDL (100%) rename {lib => extern}/SDL_image (100%) rename {lib => extern}/libpng (100%) rename {lib => extern}/zlib (100%) diff --git a/.gitmodules b/.gitmodules index 15d4e3e..e1f447a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,16 +1,16 @@ -[submodule "lib/SDL"] - path = lib/SDL +[submodule "SDL"] + path = extern/SDL url = https://github.com/libsdl-org/SDL.git branch = release-2.28.x -[submodule "lib/SDL_image"] - path = lib/SDL_image +[submodule "SDL_image"] + path = extern/SDL_image url = https://github.com/libsdl-org/SDL_image.git branch = release-2.8.x -[submodule "lib/libpng"] - path = lib/libpng +[submodule "libpng"] + path = extern/libpng url = https://github.com/glennrp/libpng.git branch = libpng16 -[submodule "lib/zlib"] - path = lib/zlib +[submodule "zlib"] + path = extern/zlib url = https://github.com/madler/zlib.git branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index 8865b00..0f04a2c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,14 +5,14 @@ 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_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}) +set(PROJECT_INCLUDE_DIR ${PROJECT_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) +add_subdirectory(extern/SDL EXCLUDE_FROM_ALL) +add_subdirectory(extern/SDL_image EXCLUDE_FROM_ALL) +add_subdirectory(extern/zlib EXCLUDE_FROM_ALL) +add_subdirectory(extern/libpng EXCLUDE_FROM_ALL) include_directories( ${PROJECT_INCLUDE_DIR} @@ -21,7 +21,7 @@ include_directories( ${ZLIB_IMAGE_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}) -file(GLOB_RECURSE SOURCES src/*.cpp) +file(GLOB_RECURSE SOURCES ${PROJECT_SOURCE_DIR}/src/*.cpp) add_executable(${PROJECT_NAME} ${SOURCES}) target_link_libraries(${PROJECT_NAME} PRIVATE diff --git a/README.md b/README.md index af0abeb..7f98a6b 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ ```sh git submodule update --init # only needed once cmake -S . -B build +cmake --build build ``` For Windows systems using MinGW the flag `-G "MinGW Makefiles"` has to be specified diff --git a/src/assets/Map.aseprite b/assets/Map.aseprite similarity index 100% rename from src/assets/Map.aseprite rename to assets/Map.aseprite diff --git a/src/assets/MapNew.aseprite b/assets/MapNew.aseprite similarity index 100% rename from src/assets/MapNew.aseprite rename to assets/MapNew.aseprite diff --git a/src/assets/cat.png b/assets/cat.png similarity index 100% rename from src/assets/cat.png rename to assets/cat.png diff --git a/src/assets/chicken_neutral.png b/assets/chicken_neutral.png similarity index 100% rename from src/assets/chicken_neutral.png rename to assets/chicken_neutral.png diff --git a/src/assets/chicken_neutral_knight.png b/assets/chicken_neutral_knight.png similarity index 100% rename from src/assets/chicken_neutral_knight.png rename to assets/chicken_neutral_knight.png diff --git a/src/assets/cow.png b/assets/cow.png similarity index 100% rename from src/assets/cow.png rename to assets/cow.png diff --git a/src/assets/dirt.png b/assets/dirt.png similarity index 100% rename from src/assets/dirt.png rename to assets/dirt.png diff --git a/src/assets/grass.png b/assets/grass.png similarity index 100% rename from src/assets/grass.png rename to assets/grass.png diff --git a/src/assets/stone.png b/assets/stone.png similarity index 100% rename from src/assets/stone.png rename to assets/stone.png diff --git a/src/assets/water.png b/assets/water.png similarity index 100% rename from src/assets/water.png rename to assets/water.png diff --git a/src/assets/water1.ase b/assets/water1.ase similarity index 100% rename from src/assets/water1.ase rename to assets/water1.ase diff --git a/src/assets/water1.png b/assets/water1.png similarity index 100% rename from src/assets/water1.png rename to assets/water1.png diff --git a/lib/SDL b/extern/SDL similarity index 100% rename from lib/SDL rename to extern/SDL diff --git a/lib/SDL_image b/extern/SDL_image similarity index 100% rename from lib/SDL_image rename to extern/SDL_image diff --git a/lib/libpng b/extern/libpng similarity index 100% rename from lib/libpng rename to extern/libpng diff --git a/lib/zlib b/extern/zlib similarity index 100% rename from lib/zlib rename to extern/zlib