diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /graphics/png.h | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
Diffstat (limited to 'graphics/png.h')
| -rw-r--r-- | graphics/png.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/graphics/png.h b/graphics/png.h index 3f8ea85320..078c76fc6b 100644 --- a/graphics/png.h +++ b/graphics/png.h @@ -27,16 +27,6 @@ * - zlib */ -// Currently, only the sword25 engine uses the PNG decoder, so skip compiling -// it if sword25 is not enabled, or if zlib (a required dependency) is not -// enabled. - -#if !(defined(ENABLE_SWORD25) || defined(USE_ZLIB)) - -// Do not compile the PNG decoder code - -#else - #ifndef GRAPHICS_PNG_H #define GRAPHICS_PNG_H @@ -176,5 +166,3 @@ private: } // End of Graphics namespace #endif // GRAPHICS_PNG_H - -#endif // Engine and zlib guard |