diff options
| author | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-08-29 18:32:20 +0200 |
|---|---|---|
| committer | Boroondas Gupte <hg@boroon.dasgupta.ch> | 2010-08-29 18:32:20 +0200 |
| commit | 9c4a2547b928beb167df133994dfe453f95cddb3 (patch) | |
| tree | b173d63e54a85535054aed216abf83abdc2f2dec /indra/llimage/llpngwrapper.h | |
| parent | 9db949eec327df4173fde3de934a87bedb0db13c (diff) | |
SNOW-737 FIXED Version agnostic libPNG linking
Patch from http://jira.secondlife.com/secure/attachment/41125/version_agnostic_libpng__1.diff
applied with fuzz 3:
patching file indra/cmake/PNG.cmake
Hunk #1 succeeded at 6 with fuzz 3 (offset -2 lines).
patching file indra/llimage/llpngwrapper.cpp
Hunk #1 succeeded at 215 (offset -2 lines).
Hunk #2 succeeded at 363 (offset -2 lines).
patching file indra/llimage/llpngwrapper.h
Hunk #1 succeeded at 31 (offset -2 lines).
Added entry in doc/contributions.txt.
No further changes other than that.
Diffstat (limited to 'indra/llimage/llpngwrapper.h')
| -rw-r--r-- | indra/llimage/llpngwrapper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimage/llpngwrapper.h b/indra/llimage/llpngwrapper.h index fd21ae697f..5ca04737e1 100644 --- a/indra/llimage/llpngwrapper.h +++ b/indra/llimage/llpngwrapper.h @@ -31,7 +31,7 @@ #ifndef LL_LLPNGWRAPPER_H #define LL_LLPNGWRAPPER_H -#include "libpng12/png.h" +#include "png.h" #include "llimage.h" class LLPngWrapper |