From 2d4229a9f1fd2c171a880a6532cea3caefd587fa Mon Sep 17 00:00:00 2001 From: Benedikt Galbavy Date: Thu, 11 Jan 2024 08:24:59 +0100 Subject: [PATCH] added zlib locally --- .gitmodules | 4 ++++ CMakeLists.txt | 2 ++ lib/zlib | 1 + 3 files changed, 7 insertions(+) create mode 160000 lib/zlib diff --git a/.gitmodules b/.gitmodules index f87c05c..15d4e3e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,3 +10,7 @@ path = lib/libpng url = https://github.com/glennrp/libpng.git branch = libpng16 +[submodule "lib/zlib"] + path = lib/zlib + url = https://github.com/madler/zlib.git + branch = master diff --git a/CMakeLists.txt b/CMakeLists.txt index d540193..c6b3d10 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,6 +13,7 @@ add_subdirectory(lib/libpng EXCLUDE_FROM_ALL) include_directories( ${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS} + ${ZLIB_IMAGE_INCLUDE_DIRS} ${PNG_INCLUDE_DIRS}) file(GLOB_RECURSE SOURCES src/*.cpp) @@ -21,6 +22,7 @@ add_executable(${PROJECT_NAME} ${SOURCES}) target_link_libraries(${PROJECT_NAME} PRIVATE SDL2 SDL2_image + ${ZLIB_LIBRARY} ${PNG_LIBRARIES} ) diff --git a/lib/zlib b/lib/zlib new file mode 160000 index 0000000..09155ea --- /dev/null +++ b/lib/zlib @@ -0,0 +1 @@ +Subproject commit 09155eaa2f9270dc4ed1fa13e2b4b2613e6e4851