diff options
| author | Aki <please@ignore.pl> | 2024-03-12 22:07:03 +0100 |
|---|---|---|
| committer | Aki <please@ignore.pl> | 2024-03-12 22:07:36 +0100 |
| commit | 81bb6873f1c0291fecbf6e429ad15ac3db66a4c0 (patch) | |
| tree | fd7552ecabeeffb45a1fbe3730ab62bc7a64dd85 /third-party/libpng/1.zlib.patch | |
| parent | f43d32d6d2cc7ecd04f4f06f20d5a6fc2c87c9ae (diff) | |
| download | starshatter-81bb6873f1c0291fecbf6e429ad15ac3db66a4c0.zip starshatter-81bb6873f1c0291fecbf6e429ad15ac3db66a4c0.tar.gz starshatter-81bb6873f1c0291fecbf6e429ad15ac3db66a4c0.tar.bz2 | |
Legal notices updated
Rename contrib -> third-party intendes to express the origin and purpose
of that part of the code better. I plan to readd contrib/ again but with
more in-project things like bash-completions, dev workflow scripts etc.
Diffstat (limited to 'third-party/libpng/1.zlib.patch')
| -rw-r--r-- | third-party/libpng/1.zlib.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/third-party/libpng/1.zlib.patch b/third-party/libpng/1.zlib.patch new file mode 100644 index 0000000..7a225e9 --- /dev/null +++ b/third-party/libpng/1.zlib.patch @@ -0,0 +1,41 @@ +diff '--color=auto' -aru a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2024-03-03 01:47:51.488773684 +0100 ++++ b/CMakeLists.txt 2024-03-03 01:49:14.398777099 +0100 +@@ -37,10 +37,6 @@ + set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR}) + set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE}) + +-# needed packages +-find_package(ZLIB REQUIRED) +-include_directories(${ZLIB_INCLUDE_DIR}) +- + if(NOT WIN32) + find_library(M_LIBRARY + NAMES m +@@ -182,7 +178,7 @@ + endif() + + # NOW BUILD OUR TARGET +-include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${ZLIB_INCLUDE_DIR}) ++include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + + if(PNG_SHARED) + add_library(${PNG_LIB_NAME} SHARED ${libpng_sources}) +@@ -191,7 +187,7 @@ + set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib") + set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib") + endif() +- target_link_libraries(${PNG_LIB_NAME} ${ZLIB_LIBRARY} ${M_LIBRARY}) ++ target_link_libraries(${PNG_LIB_NAME} Zlib::zlib ${M_LIBRARY}) + endif() + + if(PNG_STATIC) +@@ -202,7 +198,7 @@ + # msvc does not append 'lib' - do it here to have consistent name + set_target_properties(${PNG_LIB_NAME_STATIC} PROPERTIES PREFIX "lib") + endif() +- target_link_libraries(${PNG_LIB_NAME_STATIC} ${ZLIB_LIBRARY} ${M_LIBRARY}) ++ target_link_libraries(${PNG_LIB_NAME_STATIC} Zlib::zlibstatic ${M_LIBRARY}) + endif() + + |