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

2010-03-03 19:18:50 +00:00 · 2010-03-03 19:18:50 +00:00 · c5231858d4
commit c5231858d4
parent 5de69e9545
4 changed files with 9 additions and 3 deletions
--- 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)

--- 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 {
 	/*
--- a/source/gameengine/GamePlayer/common/CMakeLists.txt
+++ b/source/gameengine/GamePlayer/common/CMakeLists.txt
@ -67,6 +67,7 @@ SET(INC
 	../../../../source/blender/gpu
 	../../../../extern/glew/include
 	${PYTHON_INC}
+	${PNG_INC}
 	${ZLIB_INC}
 )

--- a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
+++ b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp
@ -33,9 +33,10 @@

 #ifdef WIN32
 #include <windows.h>
-#endif
-
 #include "png.h"
+#else
+#include <png.h>
+#endif

 #include "RAS_IPolygonMaterial.h"
 #include "GPC_Canvas.h"