0
0
mirror of https://github.com/Nimac0/SDL_Minigame synced 2026-01-12 13:43:41 +00:00

light restructure

This commit is contained in:
Benedikt Galbavy 2024-01-11 09:31:13 +01:00
parent 76f270b7be
commit c816ec582f
19 changed files with 16 additions and 15 deletions

16
.gitmodules vendored
View File

@ -1,16 +1,16 @@
[submodule "lib/SDL"] [submodule "SDL"]
path = lib/SDL path = extern/SDL
url = https://github.com/libsdl-org/SDL.git url = https://github.com/libsdl-org/SDL.git
branch = release-2.28.x branch = release-2.28.x
[submodule "lib/SDL_image"] [submodule "SDL_image"]
path = lib/SDL_image path = extern/SDL_image
url = https://github.com/libsdl-org/SDL_image.git url = https://github.com/libsdl-org/SDL_image.git
branch = release-2.8.x branch = release-2.8.x
[submodule "lib/libpng"] [submodule "libpng"]
path = lib/libpng path = extern/libpng
url = https://github.com/glennrp/libpng.git url = https://github.com/glennrp/libpng.git
branch = libpng16 branch = libpng16
[submodule "lib/zlib"] [submodule "zlib"]
path = lib/zlib path = extern/zlib
url = https://github.com/madler/zlib.git url = https://github.com/madler/zlib.git
branch = master branch = master

View File

@ -5,14 +5,14 @@ project(SDL_Minigame)
set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src) set(PROJECT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(PROJECT_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include) set(PROJECT_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
set(PROJECT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}) set(PROJECT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
add_subdirectory(lib/SDL EXCLUDE_FROM_ALL) add_subdirectory(extern/SDL EXCLUDE_FROM_ALL)
add_subdirectory(lib/SDL_image EXCLUDE_FROM_ALL) add_subdirectory(extern/SDL_image EXCLUDE_FROM_ALL)
add_subdirectory(lib/zlib EXCLUDE_FROM_ALL) add_subdirectory(extern/zlib EXCLUDE_FROM_ALL)
add_subdirectory(lib/libpng EXCLUDE_FROM_ALL) add_subdirectory(extern/libpng EXCLUDE_FROM_ALL)
include_directories( include_directories(
${PROJECT_INCLUDE_DIR} ${PROJECT_INCLUDE_DIR}
@ -21,7 +21,7 @@ include_directories(
${ZLIB_IMAGE_INCLUDE_DIRS} ${ZLIB_IMAGE_INCLUDE_DIRS}
${PNG_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}) add_executable(${PROJECT_NAME} ${SOURCES})
target_link_libraries(${PROJECT_NAME} PRIVATE target_link_libraries(${PROJECT_NAME} PRIVATE

View File

@ -3,6 +3,7 @@
```sh ```sh
git submodule update --init # only needed once git submodule update --init # only needed once
cmake -S . -B build cmake -S . -B build
cmake --build build
``` ```
For Windows systems using MinGW the flag `-G "MinGW Makefiles"` has to be specified For Windows systems using MinGW the flag `-G "MinGW Makefiles"` has to be specified

View File

Before

Width:  |  Height:  |  Size: 407 B

After

Width:  |  Height:  |  Size: 407 B

View File

Before

Width:  |  Height:  |  Size: 751 B

After

Width:  |  Height:  |  Size: 751 B

View File

Before

Width:  |  Height:  |  Size: 949 B

After

Width:  |  Height:  |  Size: 949 B

View File

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

View File

Before

Width:  |  Height:  |  Size: 456 B

After

Width:  |  Height:  |  Size: 456 B

View File

Before

Width:  |  Height:  |  Size: 673 B

After

Width:  |  Height:  |  Size: 673 B

View File

Before

Width:  |  Height:  |  Size: 279 B

After

Width:  |  Height:  |  Size: 279 B

View File

Before

Width:  |  Height:  |  Size: 340 B

After

Width:  |  Height:  |  Size: 340 B

View File

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

View File

View File

View File