Skip to content
Snippets Groups Projects

Makefile: Split zlib and libpng

Merged SteelT requested to merge SteelT/SRB2:zlib-split into master
All threads resolved!

Split zlib stuff from libpng, removing the hard dependency on libpng to decompress VGZ lumps, also uncommented lines that was commented out in sdl/mixer_sound.c, for whatever reason. If someone compiles without zlib, then PNG support will be explicitly disabled also.

Edited by SteelT

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • SteelT added 2 commits

    added 2 commits

    Compare with previous version

  • ..aaaaand you did the #endif thing again in DD's code this time.

  • Author Owner

    I fail to see the issue, honestly, it compiles just fine.

  • Author Owner

    ..Okay, that was a bit too quick of a comment, now I see the issue.

  • SteelT added 1 commit

    added 1 commit

    • b812a6a4 - Really fix DD compiling this time.

    Compare with previous version

  • SteelT resolved all discussions

    resolved all discussions

  • SteelT added 1 commit

    added 1 commit

    Compare with previous version

  • SteelT added 1 commit

    added 1 commit

    Compare with previous version

  • SteelT added 1 commit

    added 1 commit

    Compare with previous version

  • SteelT added 1 commit

    added 1 commit

    Compare with previous version

  • SteelT added 1 commit

    added 1 commit

    Compare with previous version

  • Monster Iestyn mentioned in commit 1115f41f

    mentioned in commit 1115f41f

  • mazmazz mentioned in merge request !278 (merged)

    mentioned in merge request !278 (merged)

  • Please register or sign in to reply
    Loading