#9484 closed patch (fixed)
AmigaOS4: Adding -lz to cc_check -lpng in configure
| Reported by: | raziel- | Owned by: | digitall |
|---|---|---|---|
| Priority: | normal | Component: | Port: AmigaOS4 |
| Version: | Keywords: | ||
| Cc: | Game: |
Description
AmigaOS4 needs to be explicitely told to use zlib in conjunction with png. Thus png support has to be added manually to configure's cc_check.
If no one objects i'd like to add the -lz after -lpng in cc_check Attached is a diff...sorry, i have no idea how to create a .patch file, but i hope the diff is sufficient, there are only two little changes in the diff anyway
Thank you very much
Ticket imported from: #3614979. Ticket imported from: patches/1589.
Attachments (1)
Change History (8)
by , 11 years ago
| Attachment: | configure_amigaos4_png_z.diff added |
|---|
comment:1 by , 11 years ago
| Owner: | set to |
|---|
comment:2 by , 11 years ago
comment:3 by , 11 years ago
Right, well this doesn't seem to be necessary for compilation with a static library build of libpng on the buildbot... as this is detected fine.
Raziel_: Are you sure that you are doing a static library build?
Though this is failing to build now as sword25 fails to build as libpng has now been found and enabled it... Different issue though. There is an ambiguous write() call in the soundengine.cpp code: http://buildbot.scummvm.org/builders/master-amigaos4/builds/1555/steps/compile/logs/stdio
comment:4 by , 11 years ago
@tdhs
Yes, i know it's not needed by static builds. I'm building solely shared objects when doing ScummVM
comment:5 by , 11 years ago
| Owner: | changed from to |
|---|---|
| Resolution: | → fixed |
| Status: | new → closed |
comment:6 by , 11 years ago
raziel_: Ah OK. Well, have reviewed and done a basic test and this looks to be fine for both static and shared builds of libpng so have committed to master as 7be1d48f86c58944f7860924da1e22fbf4275c64. Closing as fixed.
P.S. A number of fixes have been applied to the Sword25 engine and buildbot AOS4 build is now working fine again.
comment:7 by , 6 years ago
| Component: | → Port: AmigaOS4 |
|---|
raziel_: This is fine and a patch is basically just a diff in a specific setting ( usually diff -ruN ). Anyway, the change is clear. I am just testing the issue you indicate on the buildbot box... as I also just realised I had installed the libjpeg and libpng libraries for AOS4 to the clib2 rather than newlib tree location so they were not being picked up..
If I confirm the same result, I think adding these will be perfectly fine... as for any other builds they should just be unused..