Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dalai Felinto
2010-03-03 19:18:50 +00:00
parent 5de69e9545
commit c5231858d4
4 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/smoke/CMakeLists.txt
View File

@@ -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)

4
intern/smoke/intern/IMAGE.h
View File

@@ -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 {
/*