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.

Sign up for GitHub

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

Jump to bottom

cmake: adapt to the new vendored libpng cmake'ry : #502

Merged
merged 1 commit into from
Jan 13, 2025
Merged

cmake: adapt to the new vendored libpng cmake'ry : #502

merged 1 commit into from
Jan 13, 2025

Conversation

sezero
Copy link
Contributor

@sezero sezero commented Jan 13, 2025

  • do not set PNG_BUILD_ZLIB: it's rejected by libpng with error.
    set ZLIB_ROOT, instead.
  • set SKIP_INSTALL_CONFIG_FILE for the SDLIMAGE_ZLIB_SHARED case
    because libpng cmake config fails for zlibstatic.

@sezero
cmake: adapt to the new vendored libpng cmake'ry :
fb55536 
- do not set PNG_BUILD_ZLIB: it's rejected by libpng with error.
  set ZLIB_ROOT, instead.
- set SKIP_INSTALL_CONFIG_FILE for the SDLIMAGE_ZLIB_SHARED case
  because libpng cmake config fails for zlibstatic.
@sezero sezero requested a review from madebr January 13, 2025 15:13
sezero referenced this pull request Jan 13, 2025
@sezero
update vendored libpng from 1.6.43 to 1.6.45.
51307c4
@sezero sezero merged commit fb55536 into libsdl-org:main Jan 13, 2025
5 checks passed
@sezero sezero deleted the new-vendored-libpng branch January 13, 2025 18:35
@1bsyl
Copy link
Contributor

1bsyl commented Jan 14, 2025

Hi,
This fixes cmake build but there is also an issue compile libpng on android with android.mk:
any idea ?

external/libpng/png.c:13:
external/libpng/pngpriv.h:904:4: error: ZLIB_VERNUM != PNG_ZLIB_VERNUM       "-I (include path) error: see the notes in pngpriv.h"
  904 | #  error ZLIB_VERNUM != PNG_ZLIB_VERNUM \
      |    ^

@sezero
Copy link
Contributor Author

sezero commented Jan 14, 2025 •
edited
Loading

Hi, This fixes cmake build but there is also an issue compile libpng on android with android.mk: any idea ?

external/libpng/png.c:13:
external/libpng/pngpriv.h:904:4: error: ZLIB_VERNUM != PNG_ZLIB_VERNUM       "-I (include path) error: see the notes in pngpriv.h"
  904 | #  error ZLIB_VERNUM != PNG_ZLIB_VERNUM \
      |    ^

Was my mistake in android/pnglibconf.h of new libpng. Should be fixed now: please re-test.

@1bsyl
Copy link
Contributor

1bsyl commented Jan 14, 2025

@sezero thanks this compiles now !

@sezero
Copy link
Contributor Author

sezero commented Jan 14, 2025

You're welcome!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@madebr madebr madebr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@sezero @1bsyl @madebr