Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libpng to 1.6.42 #15159

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Update libpng to 1.6.42 #15159

merged 1 commit into from
Feb 6, 2024

Conversation

Megamouse
Copy link
Contributor

@Megamouse Megamouse commented Feb 5, 2024

  • Updates libpng to 1.6.42

This is separate from the other submodules due to potential build issues

@Megamouse Megamouse added the Build and CI Anything related to the build process and continuous integration label Feb 5, 2024
@Megamouse Megamouse force-pushed the update_libpng branch 2 times, most recently from acfebed to 86e1f6c Compare February 6, 2024 19:56
@Megamouse Megamouse merged commit 96b7e4c into RPCS3:master Feb 6, 2024
6 checks passed
@Megamouse Megamouse deleted the update_libpng branch February 6, 2024 21:43
@@ -15,4 +14,6 @@ else()
target_link_libraries(3rdparty_zlib INTERFACE zlibstatic)
target_include_directories(3rdparty_zlib INTERFACE zlib ${CMAKE_CURRENT_BINARY_DIR}/zlib)
target_compile_definitions(3rdparty_zlib INTERFACE -DZLIB_CONST=1)

set(ZLIB_ROOT ${CMAKE_CURRENT_BINARY_DIR}/zlib PARENT_SCOPE)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that this does anything. ZLIB_ROOT is searched at configuration time, but it is populated at build time, so at configuration time it will be empty.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Build and CI Anything related to the build process and continuous integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants