[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27255] trunk/blender: fix for CMake compile in windows.

[Dalai Felinto]

Revision: 27255
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27255
Author:   dfelinto
Date:     2010-03-03 20:18:50 +0100 (Wed, 03 Mar 2010)

Log Message:
-----------
fix for CMake compile in windows. ($PNG_INC was needed) - partial revert of commit 27251

Modified Paths:
--------------
    trunk/blender/intern/smoke/CMakeLists.txt
    trunk/blender/intern/smoke/intern/IMAGE.h
    trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
    trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.cpp

Modified: trunk/blender/intern/smoke/CMakeLists.txt
===================================================================
--- trunk/blender/intern/smoke/CMakeLists.txt	2010-03-03 18:49:26 UTC (rev 27254)
+++ trunk/blender/intern/smoke/CMakeLists.txt	2010-03-03 19:18:50 UTC (rev 27255)
@@ -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)
 

Modified: trunk/blender/intern/smoke/intern/IMAGE.h
===================================================================
--- trunk/blender/intern/smoke/intern/IMAGE.h	2010-03-03 18:49:26 UTC (rev 27254)
+++ trunk/blender/intern/smoke/intern/IMAGE.h	2010-03-03 19:18:50 UTC (rev 27255)
@@ -74,7 +74,11 @@
 //////////////////////////////////////////////////////////////////////
 // PNG, POV-Ray, and PBRT output functions
 //////////////////////////////////////////////////////////////////////
+#ifdef WIN32
+#include "png.h"
+#else
 #include <png.h>
+#endif
 
 namespace IMAGE {
 	/*

Modified: trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt	2010-03-03 18:49:26 UTC (rev 27254)
+++ trunk/blender/source/gameengine/GamePlayer/common/CMakeLists.txt	2010-03-03 19:18:50 UTC (rev 27255)
@@ -67,6 +67,7 @@
 	../../../../source/blender/gpu
 	../../../../extern/glew/include
 	${PYTHON_INC}
+	${PNG_INC}
 	${ZLIB_INC}
 )
 

Modified: trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.cpp	2010-03-03 18:49:26 UTC (rev 27254)
+++ trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.cpp	2010-03-03 19:18:50 UTC (rev 27255)
@@ -33,10 +33,11 @@
 
 #ifdef WIN32
 #include <windows.h>
+#include "png.h"
+#else
+#include <png.h>
 #endif
 
-#include "png.h"
-
 #include "RAS_IPolygonMaterial.h"
 #include "GPC_Canvas.h"