diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2011-05-05 22:50:17 +0400 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2011-05-05 22:50:17 +0400 |
commit | dfedec8a2ce049b514f956e2824ffe93de8a1c51 (patch) | |
tree | 2b2f57f3427f6c7e2f72289affb8841cc5202566 /source/blender | |
parent | 2137e2ecec6a04770f8a91fae952ecd79ada2f91 (diff) |
fix to scons after exotic was removed (patch from jms)
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/windowmanager/SConscript | 2 | ||||
-rw-r--r-- | source/blender/windowmanager/intern/wm_files.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index cbaf74ddc10..38266717369 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -14,6 +14,8 @@ incs += ' ../makesrna ../gpu ../blenfont' incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost' incs += ' #/intern/elbeem #/extern/glew/include' +incs += ' ' + env['BF_ZLIB_INC'] + defs = [ 'GLEW_STATIC' ] if env['WITH_BF_PYTHON']: diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c index 9171fe1714c..2783504ae90 100644 --- a/source/blender/windowmanager/intern/wm_files.c +++ b/source/blender/windowmanager/intern/wm_files.c @@ -37,6 +37,8 @@ #include <string.h> #include <errno.h> +#include "zlib.h" /* wm_read_exotic() */ + #ifdef WIN32 #include <windows.h> /* need to include windows.h so _WIN32_IE is defined */ #ifndef _WIN32_IE @@ -49,8 +51,6 @@ #include <unistd.h> /* getpid */ #endif -#include "zlib.h" /* wm_read_exotic() */ - #include "MEM_guardedalloc.h" #include "MEM_CacheLimiterC-Api.h" |