[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36505] trunk/blender/source/blender/ windowmanager: fix to scons after exotic was removed (patch from jms)

[Dalai Felinto]

Revision: 36505
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36505
Author:   dfelinto
Date:     2011-05-05 18:50:17 +0000 (Thu, 05 May 2011)
Log Message:
-----------
fix to scons after exotic was removed (patch from jms)

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/SConscript
    trunk/blender/source/blender/windowmanager/intern/wm_files.c

Modified: trunk/blender/source/blender/windowmanager/SConscript
===================================================================
--- trunk/blender/source/blender/windowmanager/SConscript	2011-05-05 17:07:20 UTC (rev 36504)
+++ trunk/blender/source/blender/windowmanager/SConscript	2011-05-05 18:50:17 UTC (rev 36505)
@@ -14,6 +14,8 @@
 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']:

Modified: trunk/blender/source/blender/windowmanager/intern/wm_files.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-05-05 17:07:20 UTC (rev 36504)
+++ trunk/blender/source/blender/windowmanager/intern/wm_files.c	2011-05-05 18:50:17 UTC (rev 36505)
@@ -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"