From c5231858d4106b8705c130534dfa71177495c084 Mon Sep 17 00:00:00 2001
From: Dalai Felinto <dfelinto@gmail.com>
Date: Wed, 3 Mar 2010 19:18:50 +0000
Subject: fix for CMake compile in windows. ($PNG_INC was needed) - partial
 revert of commit 27251

---
 intern/smoke/CMakeLists.txt | 2 +-
 intern/smoke/intern/IMAGE.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'intern/smoke')

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 {
 	/*
-- 
cgit v1.2.3