diff options
author | Aki <please@ignore.pl> | 2024-03-03 02:21:46 +0100 |
---|---|---|
committer | Aki <please@ignore.pl> | 2024-03-03 02:26:05 +0100 |
commit | dad0e8562c8e5994fcf2ebedac5a7ec920297d1f (patch) | |
tree | 1bf6bc6aa5531594588a5ec248e976110365c301 /contrib/libpng/3.includes.patch | |
parent | ca18c5b1b5004ffa88b6b3b85cd038d1217c09c6 (diff) | |
download | starshatter-dad0e8562c8e5994fcf2ebedac5a7ec920297d1f.zip starshatter-dad0e8562c8e5994fcf2ebedac5a7ec920297d1f.tar.gz starshatter-dad0e8562c8e5994fcf2ebedac5a7ec920297d1f.tar.bz2 |
libpng sources removed from this tree
Diffstat (limited to 'contrib/libpng/3.includes.patch')
-rw-r--r-- | contrib/libpng/3.includes.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/contrib/libpng/3.includes.patch b/contrib/libpng/3.includes.patch new file mode 100644 index 0000000..c48e163 --- /dev/null +++ b/contrib/libpng/3.includes.patch @@ -0,0 +1,37 @@ +diff '--color=auto' -arNu a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2024-03-03 02:11:16.832164723 +0100 ++++ b/CMakeLists.txt 2024-03-03 02:19:25.775518136 +0100 +@@ -106,7 +106,6 @@ + # Use the prebuilt pnglibconf.h file from the scripts folder + configure_file(${CMAKE_CURRENT_SOURCE_DIR}/scripts/pnglibconf.h.prebuilt + ${CMAKE_CURRENT_BINARY_DIR}/pnglibconf.h) +-include_directories(${CMAKE_CURRENT_BINARY_DIR}) + + # OUR SOURCES + set(libpng_public_hdrs +@@ -177,9 +176,6 @@ + add_definitions(-DPNG_NO_FLOATING_POINT_SUPPORTED) + endif() + +-# NOW BUILD OUR TARGET +-include_directories(${CMAKE_CURRENT_SOURCE_DIR}) +- + if(PNG_SHARED) + add_library(${PNG_LIB_NAME} SHARED ${libpng_sources}) + if(MSVC) +@@ -187,6 +183,7 @@ + set_target_properties(${PNG_LIB_NAME} PROPERTIES PREFIX "lib") + set_target_properties(${PNG_LIB_NAME} PROPERTIES IMPORT_PREFIX "lib") + endif() ++ target_include_directories(${PNG_LIB_NAME} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + target_link_libraries(${PNG_LIB_NAME} Zlib::zlib ${M_LIBRARY}) + endif() + +@@ -198,6 +195,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_include_directories(${PNG_LIB_NAME_STATIC} PUBLIC ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) + target_link_libraries(${PNG_LIB_NAME_STATIC} Zlib::zlibstatic ${M_LIBRARY}) + endif() + |