From 8becf9e314eee18aace11783d13f65f3389d3897 Mon Sep 17 00:00:00 2001 From: Benedikt Galbavy Date: Mon, 8 Jan 2024 19:47:39 +0100 Subject: [PATCH] added more libaries --- .gitmodules | 4 ++++ CMakeLists.txt | 18 +++++++++++++++++- lib/libpng | 1 + 3 files changed, 22 insertions(+), 1 deletion(-) create mode 160000 lib/libpng diff --git a/.gitmodules b/.gitmodules index fcf267e..f87c05c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,3 +6,7 @@ path = lib/SDL_image url = https://github.com/libsdl-org/SDL_image.git branch = release-2.8.x +[submodule "lib/libpng"] + path = lib/libpng + url = https://github.com/glennrp/libpng.git + branch = libpng16 diff --git a/CMakeLists.txt b/CMakeLists.txt index 82ef175..82b3b71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,15 +5,31 @@ project(SDL_Minigame) set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) +# libpng stuff +set(PNG_SHARED ON CACHE BOOL "" FORCE) +set(PNG_STATIC OFF CACHE BOOL "" FORCE) +set(PNG_EXECUTABLES OFF CACHE BOOL "" FORCE) # we only want lib +set(PNG_TESTS OFF CACHE BOOL "" FORCE) # we only want lib +set(SKIP_INSTALL_ALL OFF CACHE BOOL "" FORCE) # we only want lib + +include_directories(libpng) + add_subdirectory(lib/SDL) add_subdirectory(lib/SDL_image) +add_subdirectory(lib/libpng) find_package(SDL2 REQUIRED CONFIG REQUIRED COMPONENTS SDL2) find_package(SDL2 REQUIRED CONFIG COMPONENTS SDL2main) find_package(SDL_image REQUIRED) +find_package(ZLIB REQUIRED) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}/libpng) + file(GLOB_RECURSE SOURCES src/*.cpp) add_executable(game ${SOURCES}) target_link_libraries(game PRIVATE SDL2::SDL2main) -target_link_libraries(game PRIVATE SDL2::SDL2 SDL2_image ${SDL2_LIBRARIES} ${SDL_IMAGE_LIBRARIES}) \ No newline at end of file +target_link_libraries(game PRIVATE SDL2::SDL2 SDL2_image ${SDL2_LIBRARIES} ${SDL_IMAGE_LIBRARIES}) +target_link_libraries(game PRIVATE ZLIB::ZLIB) +target_link_libraries(game PRIVATE png) \ No newline at end of file diff --git a/lib/libpng b/lib/libpng new file mode 160000 index 0000000..71b9b5e --- /dev/null +++ b/lib/libpng @@ -0,0 +1 @@ +Subproject commit 71b9b5e16ef751d973a3935284382bc344ff9941