diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2010-03-03 22:18:50 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2010-03-03 22:18:50 +0300 |
| commit | c5231858d4106b8705c130534dfa71177495c084 (patch) | |
| tree | 79d7090b95e1b33f69ba686f3ea1c8ccc3979a6e /intern/smoke | |
| parent | 5de69e9545d2f3fa2e694c757a9ccf08fafe58eb (diff) | |
fix for CMake compile in windows. ($PNG_INC was needed) - partial revert of commit 27251
Diffstat (limited to 'intern/smoke')
| -rw-r--r-- | intern/smoke/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | intern/smoke/intern/IMAGE.h | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/intern/smoke/CMakeLists.txt b/intern/smoke/CMakeLists.txt index 33dcd5be4bc..1ab323fe70d 100644 --- a/intern/smoke/CMakeLists.txt +++ b/intern/smoke/CMakeLists.txt @@ -24,7 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -SET(INC ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc) +SET(INC ${ZLIB_INC} ${PNG_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc) FILE(GLOB SRC intern/*.cpp) diff --git a/intern/smoke/intern/IMAGE.h b/intern/smoke/intern/IMAGE.h index a57f164509e..ba9b469727b 100644 --- a/intern/smoke/intern/IMAGE.h +++ b/intern/smoke/intern/IMAGE.h @@ -74,7 +74,11 @@ template < class T > inline float MIN3V( T vec) { ////////////////////////////////////////////////////////////////////// // PNG, POV-Ray, and PBRT output functions ////////////////////////////////////////////////////////////////////// +#ifdef WIN32 +#include "png.h" +#else #include <png.h> +#endif namespace IMAGE { /* |