diff options
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/Makefile | 1 | ||||
| -rw-r--r-- | source/blender/windowmanager/intern/wm_init_exit.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/windowmanager/SConscript b/source/blender/windowmanager/SConscript index e70a7207c11..cdc5edfeaa6 100644 --- a/source/blender/windowmanager/SConscript +++ b/source/blender/windowmanager/SConscript @@ -11,5 +11,5 @@ incs += ' ../nodes ../imbuf ../blenloader ../render/extern/include' incs += ' ../ftfont ../radiosity/extern/include ../../kernel/gen_system' incs += ' #/intern/guardedalloc #/intern/memutil #/intern/ghost #/intern/bmfont' -incs += ' #/intern/elbeem' +incs += ' #/intern/elbeem #/extern/glew/include' env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), [], libtype=['core','intern'], priority=[45, 45] ) diff --git a/source/blender/windowmanager/intern/Makefile b/source/blender/windowmanager/intern/Makefile index 3eb4ef7a028..cbd0b3afa87 100644 --- a/source/blender/windowmanager/intern/Makefile +++ b/source/blender/windowmanager/intern/Makefile @@ -36,6 +36,7 @@ include nan_compile.mk CFLAGS += $(LEVEL_1_C_WARNINGS) # OpenGL and Python +CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += $(OGL_CPPFLAGS) CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) diff --git a/source/blender/windowmanager/intern/wm_init_exit.c b/source/blender/windowmanager/intern/wm_init_exit.c index 67670383060..422a655f53a 100644 --- a/source/blender/windowmanager/intern/wm_init_exit.c +++ b/source/blender/windowmanager/intern/wm_init_exit.c @@ -240,8 +240,8 @@ void WM_exit(bContext *C) MEM_freeN(C); - if(totblock!=0) { - printf("Error Totblock: %d\n",totblock); + if(MEM_get_memory_blocks_in_use()!=0) { + printf("Error Totblock: %d\n", MEM_get_memory_blocks_in_use()); MEM_printmemlist(); } // delete_autosave(); |