diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2010-03-03 22:18:50 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2010-03-03 22:18:50 +0300 |
commit | c5231858d4106b8705c130534dfa71177495c084 (patch) | |
tree | 79d7090b95e1b33f69ba686f3ea1c8ccc3979a6e /source/gameengine/GamePlayer/common | |
parent | 5de69e9545d2f3fa2e694c757a9ccf08fafe58eb (diff) |
fix for CMake compile in windows. ($PNG_INC was needed) - partial revert of commit 27251
Diffstat (limited to 'source/gameengine/GamePlayer/common')
-rw-r--r-- | source/gameengine/GamePlayer/common/CMakeLists.txt | 1 | ||||
-rw-r--r-- | source/gameengine/GamePlayer/common/GPC_Canvas.cpp | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/gameengine/GamePlayer/common/CMakeLists.txt b/source/gameengine/GamePlayer/common/CMakeLists.txt index 909aebfc387..418b77357a4 100644 --- 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} ) diff --git a/source/gameengine/GamePlayer/common/GPC_Canvas.cpp b/source/gameengine/GamePlayer/common/GPC_Canvas.cpp index 467eb074ed9..54675fa8284 100644 --- 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" |