diff options
| -rw-r--r-- | intern/elbeem/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/IMAGE.h | 5 | ||||
| -rw-r--r-- | source/gameengine/GamePlayer/common/GPC_Canvas.cpp | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/intern/elbeem/CMakeLists.txt b/intern/elbeem/CMakeLists.txt index c8a47871637..f0c71e067fc 100644 --- a/intern/elbeem/CMakeLists.txt +++ b/intern/elbeem/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ${ZLIB_INC} extern) +SET(INC ${ZLIB_INC} ${PNG_INC} extern) FILE(GLOB SRC intern/*.cpp) diff --git a/intern/smoke/intern/IMAGE.h b/intern/smoke/intern/IMAGE.h index ba9b469727b..1f4fe51a4e7 100644 --- a/intern/smoke/intern/IMAGE.h +++ b/intern/smoke/intern/IMAGE.h @@ -74,12 +74,17 @@ template < class T > inline float MIN3V( T vec) { ////////////////////////////////////////////////////////////////////// // PNG, POV-Ray, and PBRT output functions ////////////////////////////////////////////////////////////////////// +#ifndef NOPNG #ifdef WIN32 #include "png.h" #else #include <png.h> #endif +#endif // NOPNG +/* + NOTE when someone decided to uncomment the following code, please remember to put it between #ifndef NOPNG #endif +*/ namespace IMAGE { /* static int writePng(const char *fileName, unsigned char **rowsp, int w, int h) diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp index 54675fa8284..3fa27b40928 100644 --- a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp +++ b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp @@ -31,12 +31,13 @@ #include <config.h> #endif +#ifndef NOPNG #ifdef WIN32 -#include <windows.h> #include "png.h" #else #include <png.h> #endif +#endif // NOPNG #include "RAS_IPolygonMaterial.h" #include "GPC_Canvas.h" |