fix to scons after exotic was removed (patch from jms)
authorDalai Felinto <dfelinto@gmail.com>
Thu, 5 May 2011 18:50:17 +0000 (18:50 +0000)
committerDalai Felinto <dfelinto@gmail.com>
Thu, 5 May 2011 18:50:17 +0000 (18:50 +0000)
source/blender/windowmanager/SConscript
source/blender/windowmanager/intern/wm_files.c

index cbaf74ddc104b23562060e5ca10e30a71e3fb7ac..3826671736999c85df23e6fc48d20007247f68a8 100644 (file)
@@ -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']:
index 9171fe1714caa9a9c29e5f70a4807851992a2a77..2783504ae9001963022072421c826bf2d021767e 100644 (file)
@@ -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"