forked from bartvdbraak/blender
fix for CMake compile in windows. ($PNG_INC was needed) - partial revert of commit 27251
This commit is contained in:
parent
5de69e9545
commit
c5231858d4
@ -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)
|
||||
|
||||
|
@ -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 {
|
||||
/*
|
||||
|
@ -67,6 +67,7 @@ SET(INC
|
||||
../../../../source/blender/gpu
|
||||
../../../../extern/glew/include
|
||||
${PYTHON_INC}
|
||||
${PNG_INC}
|
||||
${ZLIB_INC}
|
||||
)
|
||||
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user