SDL: Don't include png.h when building without libpng

Should make possible to build on AmigaOS 4 where the Image namespace conflicts with a struct from the SDK.
residualvm · May 19, 2019 · 119ff7f · 119ff7f
1 parent 3cfb8b1
commit 119ff7f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/backends/graphics/openglsdl/openglsdl-graphics.cpp b/backends/graphics/openglsdl/openglsdl-graphics.cpp
@@ -37,7 +37,9 @@
 #include "graphics/opengl/system_headers.h"
 #include "graphics/opengl/texture.h"
 #include "graphics/opengl/tiledsurface.h"
+#ifdef USE_PNG
 #include "image/png.h"
+#endif
 
 OpenGLSdlGraphicsManager::OpenGLSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window, const Capabilities &capabilities)
 	:

diff --git a/backends/graphics/surfacesdl/surfacesdl-graphics.cpp b/backends/graphics/surfacesdl/surfacesdl-graphics.cpp
@@ -31,7 +31,9 @@
 #include "engines/engine.h"
 #include "graphics/pixelbuffer.h"
 #include "graphics/surface.h"
+#ifdef USE_PNG
 #include "image/png.h"
+#endif
 
 SurfaceSdlGraphicsManager::SurfaceSdlGraphicsManager(SdlEventSource *sdlEventSource, SdlWindow *window, const Capabilities &capabilities)
 	: