From dea59cc5eb6562272df361c062f7ed226c2b7a36 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 18 Sep 2010 03:55:56 +0000 Subject: warning fixes and minor cmake changes. --- source/blender/blenkernel/CMakeLists.txt | 2 +- source/blender/blenkernel/intern/effect.c | 1 - source/blender/blenloader/CMakeLists.txt | 11 ++++++++--- source/blender/blenpluginapi/CMakeLists.txt | 7 ++++++- source/blender/editors/render/CMakeLists.txt | 9 ++++----- source/blender/editors/screen/CMakeLists.txt | 4 ++-- source/blender/editors/screen/screen_edit.c | 1 + source/blender/editors/sculpt_paint/CMakeLists.txt | 4 ++-- source/blender/editors/sound/CMakeLists.txt | 6 +++--- source/blender/editors/space_action/CMakeLists.txt | 5 ++--- source/blender/editors/space_api/CMakeLists.txt | 4 ++-- source/blender/editors/space_buttons/CMakeLists.txt | 4 ++-- source/blender/editors/space_console/CMakeLists.txt | 4 ++-- source/blender/editors/space_file/CMakeLists.txt | 7 +++---- source/blender/editors/space_graph/CMakeLists.txt | 4 ++-- source/blender/editors/space_image/CMakeLists.txt | 6 +++--- source/blender/editors/space_info/CMakeLists.txt | 4 ++-- source/blender/editors/space_logic/CMakeLists.txt | 4 ++-- source/blender/editors/space_nla/CMakeLists.txt | 4 ++-- source/blender/editors/space_node/CMakeLists.txt | 8 ++++---- source/blender/editors/space_outliner/CMakeLists.txt | 6 +++--- source/blender/editors/space_script/CMakeLists.txt | 6 +++--- source/blender/editors/space_sequencer/CMakeLists.txt | 4 ++-- source/blender/editors/space_sound/CMakeLists.txt | 4 ++-- source/blender/editors/space_text/CMakeLists.txt | 6 +++--- source/blender/editors/space_time/CMakeLists.txt | 4 ++-- source/blender/editors/space_userpref/CMakeLists.txt | 2 +- source/blender/editors/space_view3d/CMakeLists.txt | 8 ++++---- source/blender/editors/transform/CMakeLists.txt | 4 ++-- source/blender/editors/util/CMakeLists.txt | 4 ++-- source/blender/editors/uvedit/CMakeLists.txt | 6 +++--- source/blender/gpu/CMakeLists.txt | 15 ++++++++++++--- source/blender/imbuf/CMakeLists.txt | 8 ++++---- source/blender/imbuf/intern/cineon/CMakeLists.txt | 8 ++++---- source/blender/imbuf/intern/dds/CMakeLists.txt | 8 ++++---- source/blender/makesdna/intern/CMakeLists.txt | 10 +++++++++- source/blender/windowmanager/intern/wm_event_system.c | 9 ++++++--- 37 files changed, 119 insertions(+), 92 deletions(-) (limited to 'source') diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 155d14fb5a1..ccead684a88 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -31,7 +31,6 @@ SET(INC ../avi ../blenlib ../blenloader - ../editors/include ../gpu ../ikplugin ../imbuf @@ -39,6 +38,7 @@ SET(INC ../makesrna ../modifiers ../nodes + ../editors/include ../render/extern/include ../../../extern/glew/include ../../../intern/audaspace/intern diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index 0da5e0da2c4..4860e7d8eed 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -86,7 +86,6 @@ #include "BKE_object.h" #include "BKE_particle.h" #include "BKE_scene.h" -#include "BKE_screen.h" #include "BKE_utildefines.h" #include "RE_render_ext.h" diff --git a/source/blender/blenloader/CMakeLists.txt b/source/blender/blenloader/CMakeLists.txt index cae0fccd12a..cc70d3355f2 100644 --- a/source/blender/blenloader/CMakeLists.txt +++ b/source/blender/blenloader/CMakeLists.txt @@ -27,10 +27,15 @@ FILE(GLOB SRC intern/*.c) SET(INC - . ../../../intern/guardedalloc ../blenlib ../blenkernel - ../makesdna ../readblenfile ../include ../makesrna - ../python ../../kernel/gen_messaging + . + ../blenlib + ../blenkernel + ../makesdna + ../readblenfile + ../include + ../makesrna ../render/extern/include + ../../../intern/guardedalloc ${ZLIB_INC} ) diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index 42aa5eddc42..3abf1e44449 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -27,7 +27,12 @@ FILE(GLOB SRC intern/*.c) SET(INC - . .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna + . + .. + ../blenlib + ../imbuf + ../makesdna + ../../../intern/guardedalloc ) IF(WIN32) diff --git a/source/blender/editors/render/CMakeLists.txt b/source/blender/editors/render/CMakeLists.txt index 322e69ca843..d494355a1e9 100644 --- a/source/blender/editors/render/CMakeLists.txt +++ b/source/blender/editors/render/CMakeLists.txt @@ -22,24 +22,23 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader ../../gpu ../../imbuf - ../include - ../../../../intern/guardedalloc - ../../../../extern/glew/include ../../makesdna ../../makesrna - ../../python ../../render/extern/include ../../windowmanager + ../../../../intern/guardedalloc + ../../../../extern/glew/include ) IF(WITH_QUICKTIME) - SET(INC ${INC} ../../quicktime ${QUICKTIME_INC}) + LIST(APPEND INC ../../quicktime ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) ENDIF(WITH_QUICKTIME) diff --git a/source/blender/editors/screen/CMakeLists.txt b/source/blender/editors/screen/CMakeLists.txt index b6a8e27449b..f7dfd81dba9 100644 --- a/source/blender/editors/screen/CMakeLists.txt +++ b/source/blender/editors/screen/CMakeLists.txt @@ -22,15 +22,15 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) IF(WIN32) diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c index 1ca8bff3193..eb70eef988c 100644 --- a/source/blender/editors/screen/screen_edit.c +++ b/source/blender/editors/screen/screen_edit.c @@ -53,6 +53,7 @@ #include "ED_object.h" #include "ED_screen.h" #include "ED_screen_types.h" +#include "ED_fileselect.h" #include "UI_interface.h" diff --git a/source/blender/editors/sculpt_paint/CMakeLists.txt b/source/blender/editors/sculpt_paint/CMakeLists.txt index fb8382e10ca..3211763b619 100644 --- a/source/blender/editors/sculpt_paint/CMakeLists.txt +++ b/source/blender/editors/sculpt_paint/CMakeLists.txt @@ -22,16 +22,16 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../imbuf ../../gpu ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager ../../render/extern/include + ../../../../intern/guardedalloc ) IF(WIN32) diff --git a/source/blender/editors/sound/CMakeLists.txt b/source/blender/editors/sound/CMakeLists.txt index 02765726c6e..456c02d947e 100644 --- a/source/blender/editors/sound/CMakeLists.txt +++ b/source/blender/editors/sound/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc - ../../../../intern/audaspace/intern ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc + ../../../../intern/audaspace/intern ) BLENDERLIB(bf_editor_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/space_action/CMakeLists.txt b/source/blender/editors/space_action/CMakeLists.txt index 85275b2db23..3c0585c31ca 100644 --- a/source/blender/editors/space_action/CMakeLists.txt +++ b/source/blender/editors/space_action/CMakeLists.txt @@ -22,14 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) - BLENDERLIB(bf_editor_space_action "${SRC}" "${INC}") diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 591e97f800f..da140fe0982 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_api "${SRC}" "${INC}") diff --git a/source/blender/editors/space_buttons/CMakeLists.txt b/source/blender/editors/space_buttons/CMakeLists.txt index bb50ac0cc86..f8e9536ecf8 100644 --- a/source/blender/editors/space_buttons/CMakeLists.txt +++ b/source/blender/editors/space_buttons/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_buttons "${SRC}" "${INC}") diff --git a/source/blender/editors/space_console/CMakeLists.txt b/source/blender/editors/space_console/CMakeLists.txt index 0cee45576b8..59074bcbb79 100644 --- a/source/blender/editors/space_console/CMakeLists.txt +++ b/source/blender/editors/space_console/CMakeLists.txt @@ -22,15 +22,15 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) IF(NOT WITH_PYTHON) diff --git a/source/blender/editors/space_file/CMakeLists.txt b/source/blender/editors/space_file/CMakeLists.txt index 207d83b56c6..2a204d67537 100644 --- a/source/blender/editors/space_file/CMakeLists.txt +++ b/source/blender/editors/space_file/CMakeLists.txt @@ -22,18 +22,17 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib ../../blenloader ../../imbuf - ../include - ../../../../intern/audaspace/intern - ../../../../intern/guardedalloc ../../makesdna ../../makesrna - ../../render/extern/include ../../windowmanager + ../../render/extern/include + ../../../../intern/guardedalloc ) IF(WITH_IMAGE_OPENEXR) diff --git a/source/blender/editors/space_graph/CMakeLists.txt b/source/blender/editors/space_graph/CMakeLists.txt index 6ad95d920c6..33ddbcea019 100644 --- a/source/blender/editors/space_graph/CMakeLists.txt +++ b/source/blender/editors/space_graph/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ../../../../intern/audaspace/intern ) diff --git a/source/blender/editors/space_image/CMakeLists.txt b/source/blender/editors/space_image/CMakeLists.txt index 1c0a97767b7..d47f5a9820e 100644 --- a/source/blender/editors/space_image/CMakeLists.txt +++ b/source/blender/editors/space_image/CMakeLists.txt @@ -22,15 +22,15 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna - ../../render/extern/include ../../windowmanager + ../../render/extern/include + ../../../../intern/guardedalloc ) IF(WITH_IMAGE_OPENEXR) diff --git a/source/blender/editors/space_info/CMakeLists.txt b/source/blender/editors/space_info/CMakeLists.txt index aa9a40ac98f..9d439c4ec00 100644 --- a/source/blender/editors/space_info/CMakeLists.txt +++ b/source/blender/editors/space_info/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_info "${SRC}" "${INC}") diff --git a/source/blender/editors/space_logic/CMakeLists.txt b/source/blender/editors/space_logic/CMakeLists.txt index 91087d57f11..6f0a260124d 100644 --- a/source/blender/editors/space_logic/CMakeLists.txt +++ b/source/blender/editors/space_logic/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager ../../editors/interface + ../../../../intern/guardedalloc ) IF(WITH_GAMEENGINE) diff --git a/source/blender/editors/space_nla/CMakeLists.txt b/source/blender/editors/space_nla/CMakeLists.txt index be8020b0793..6bb656cba8c 100644 --- a/source/blender/editors/space_nla/CMakeLists.txt +++ b/source/blender/editors/space_nla/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_nla "${SRC}" "${INC}") diff --git a/source/blender/editors/space_node/CMakeLists.txt b/source/blender/editors/space_node/CMakeLists.txt index 06dd2257147..ae298a611e9 100644 --- a/source/blender/editors/space_node/CMakeLists.txt +++ b/source/blender/editors/space_node/CMakeLists.txt @@ -22,17 +22,17 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc - ../../../../intern/opennl/extern ../../makesdna ../../makesrna ../../nodes - ../../render/extern/include ../../windowmanager + ../../render/extern/include + ../../../../intern/guardedalloc + ../../../../intern/opennl/extern ) IF(WIN32) diff --git a/source/blender/editors/space_outliner/CMakeLists.txt b/source/blender/editors/space_outliner/CMakeLists.txt index 78c4fcbdd8d..5ebe47f8c5e 100644 --- a/source/blender/editors/space_outliner/CMakeLists.txt +++ b/source/blender/editors/space_outliner/CMakeLists.txt @@ -22,15 +22,15 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc - ../../../../intern/opennl/extern ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc + ../../../../intern/opennl/extern ) BLENDERLIB(bf_editor_space_outliner "${SRC}" "${INC}") diff --git a/source/blender/editors/space_script/CMakeLists.txt b/source/blender/editors/space_script/CMakeLists.txt index 58b3affe2d4..7abaa4db441 100644 --- a/source/blender/editors/space_script/CMakeLists.txt +++ b/source/blender/editors/space_script/CMakeLists.txt @@ -22,17 +22,17 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) IF(WITH_PYTHON) - SET(INC ${INC} ${PYTHON_INC} ../../python) + LIST(APPEND INC ${PYTHON_INC} ../../python) ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) diff --git a/source/blender/editors/space_sequencer/CMakeLists.txt b/source/blender/editors/space_sequencer/CMakeLists.txt index 383cc05b7f7..fa99d35a7cd 100644 --- a/source/blender/editors/space_sequencer/CMakeLists.txt +++ b/source/blender/editors/space_sequencer/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib ../../imbuf - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ../../../../intern/audaspace/intern ) diff --git a/source/blender/editors/space_sound/CMakeLists.txt b/source/blender/editors/space_sound/CMakeLists.txt index 60c8f5e44bd..c78fc11a908 100644 --- a/source/blender/editors/space_sound/CMakeLists.txt +++ b/source/blender/editors/space_sound/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_sound "${SRC}" "${INC}") diff --git a/source/blender/editors/space_text/CMakeLists.txt b/source/blender/editors/space_text/CMakeLists.txt index 0616cf5147a..eabf508b5f6 100644 --- a/source/blender/editors/space_text/CMakeLists.txt +++ b/source/blender/editors/space_text/CMakeLists.txt @@ -22,18 +22,18 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenfont ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) IF(WITH_PYTHON) - SET(INC ${INC} ${PYTHON_INC} ../../python) + LIST(APPEND INC ${PYTHON_INC} ../../python) ELSE(WITH_PYTHON) ADD_DEFINITIONS(-DDISABLE_PYTHON) ENDIF(WITH_PYTHON) diff --git a/source/blender/editors/space_time/CMakeLists.txt b/source/blender/editors/space_time/CMakeLists.txt index 39b7ba355b9..4da42ec1f42 100644 --- a/source/blender/editors/space_time/CMakeLists.txt +++ b/source/blender/editors/space_time/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_time "${SRC}" "${INC}") diff --git a/source/blender/editors/space_userpref/CMakeLists.txt b/source/blender/editors/space_userpref/CMakeLists.txt index 1752f39cfa5..d57661bb166 100644 --- a/source/blender/editors/space_userpref/CMakeLists.txt +++ b/source/blender/editors/space_userpref/CMakeLists.txt @@ -25,10 +25,10 @@ SET(INC ../include ../../blenkernel ../../blenlib - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_space_userpref "${SRC}" "${INC}") diff --git a/source/blender/editors/space_view3d/CMakeLists.txt b/source/blender/editors/space_view3d/CMakeLists.txt index ca9ad001a40..48747898981 100644 --- a/source/blender/editors/space_view3d/CMakeLists.txt +++ b/source/blender/editors/space_view3d/CMakeLists.txt @@ -28,16 +28,16 @@ SET(INC ../../blenlib ../../gpu ../../imbuf - ../../../../intern/guardedalloc - ../../../../intern/smoke/extern ../../makesdna ../../makesrna - ../../render/extern/include ../../windowmanager + ../../render/extern/include + ../../../../intern/guardedalloc + ../../../../intern/smoke/extern ) IF(WITH_GAMEENGINE) - SET(INC ${INC} ../../../kernel/gen_system) + LIST(APPEND INC ../../../kernel/gen_system) ADD_DEFINITIONS(-DGAMEBLENDER) ENDIF(WITH_GAMEENGINE) diff --git a/source/blender/editors/transform/CMakeLists.txt b/source/blender/editors/transform/CMakeLists.txt index e67771270cf..e28ed89c80c 100644 --- a/source/blender/editors/transform/CMakeLists.txt +++ b/source/blender/editors/transform/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_transform "${SRC}" "${INC}") diff --git a/source/blender/editors/util/CMakeLists.txt b/source/blender/editors/util/CMakeLists.txt index b4b2fd12cef..be700b17b7a 100644 --- a/source/blender/editors/util/CMakeLists.txt +++ b/source/blender/editors/util/CMakeLists.txt @@ -22,13 +22,13 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc ) BLENDERLIB(bf_editor_util "${SRC}" "${INC}") diff --git a/source/blender/editors/uvedit/CMakeLists.txt b/source/blender/editors/uvedit/CMakeLists.txt index 297863b2a9f..36cd1274ec7 100644 --- a/source/blender/editors/uvedit/CMakeLists.txt +++ b/source/blender/editors/uvedit/CMakeLists.txt @@ -22,14 +22,14 @@ FILE(GLOB SRC *.c) SET(INC + ../include ../../blenkernel ../../blenlib - ../include - ../../../../intern/guardedalloc - ../../../../intern/opennl/extern ../../makesdna ../../makesrna ../../windowmanager + ../../../../intern/guardedalloc + ../../../../intern/opennl/extern ) BLENDERLIB(bf_editor_uvedit "${SRC}" "${INC}") diff --git a/source/blender/gpu/CMakeLists.txt b/source/blender/gpu/CMakeLists.txt index 126cddf852f..5de7b0c5281 100644 --- a/source/blender/gpu/CMakeLists.txt +++ b/source/blender/gpu/CMakeLists.txt @@ -26,9 +26,18 @@ FILE(GLOB SRC intern/*.c) -SET(INC - . ../blenlib ../blenkernel ../makesdna ../makesrna ../include - ../../../extern/glew/include ../../../intern/guardedalloc ../../../intern/smoke/extern ../imbuf) +SET(INC + . + ../blenlib + ../blenkernel + ../include + ../imbuf + ../makesdna + ../makesrna + ../../../extern/glew/include + ../../../intern/guardedalloc + ../../../intern/smoke/extern +) IF(WIN32) INCLUDE_DIRECTORIES(${PTHREADS_INC}) diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index c0023d49c95..699ed6e1b00 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -29,12 +29,12 @@ FILE(GLOB SRC intern/*.c) SET(INC . - ../makesdna - ../../../intern/guardedalloc - ../../../intern/memutil - ../blenlib ../avi + ../blenlib ../blenkernel + ../makesdna + ../../../intern/memutil + ../../../intern/guardedalloc ${JPEG_INC} ${PNG_INC} ${ZLIB_INC} diff --git a/source/blender/imbuf/intern/cineon/CMakeLists.txt b/source/blender/imbuf/intern/cineon/CMakeLists.txt index cd887b6fc4e..5633d2a66f6 100644 --- a/source/blender/imbuf/intern/cineon/CMakeLists.txt +++ b/source/blender/imbuf/intern/cineon/CMakeLists.txt @@ -28,13 +28,13 @@ FILE(GLOB SRC *.c) SET(INC . - ../../../blenkernel - ../../ .. - ../../../blenlib + ../../ intern/include - ../../../../../intern/guardedalloc + ../../../blenkernel + ../../../blenlib ../../../makesdna + ../../../../../intern/guardedalloc ) BLENDERLIB(bf_cineon "${SRC}" "${INC}") diff --git a/source/blender/imbuf/intern/dds/CMakeLists.txt b/source/blender/imbuf/intern/dds/CMakeLists.txt index 376dd3d61f4..620d4041703 100644 --- a/source/blender/imbuf/intern/dds/CMakeLists.txt +++ b/source/blender/imbuf/intern/dds/CMakeLists.txt @@ -28,12 +28,12 @@ FILE (GLOB SRC *.cpp) SET(INC . - ../../../blenkernel - ../../../makesdna - ../../ .. + ./intern/include + ../../ ../../../blenlib - intern/include + ../../../blenkernel + ../../../makesdna ../../../../../intern/guardedalloc ) diff --git a/source/blender/makesdna/intern/CMakeLists.txt b/source/blender/makesdna/intern/CMakeLists.txt index 0eb42373d6d..d42289e17c4 100644 --- a/source/blender/makesdna/intern/CMakeLists.txt +++ b/source/blender/makesdna/intern/CMakeLists.txt @@ -28,7 +28,15 @@ INCLUDE_DIRECTORIES(../../../../intern/guardedalloc ..) FILE(GLOB INC_FILES ../*.h) # Build makesdna executable -SET(SRC makesdna.c ../../../../intern/guardedalloc/intern/mallocn.c ../../../../intern/guardedalloc/intern/mmap_win.c) +SET(SRC + makesdna.c + ../../../../intern/guardedalloc/intern/mallocn.c +) + +IF(WIN32) + LIST(APPEND SRC ../../../../intern/guardedalloc/intern/mmap_win.c) +ENDIF(WIN32) + ADD_EXECUTABLE(makesdna ${SRC} ${INC_FILES}) # Output dna.c diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c index 9e7606a9f14..2f3c56b9184 100644 --- a/source/blender/windowmanager/intern/wm_event_system.c +++ b/source/blender/windowmanager/intern/wm_event_system.c @@ -1232,11 +1232,14 @@ static int wm_handler_fileselect_call(bContext *C, ListBase *handlers, wmEventHa /* remlink now, for load file case before removing*/ BLI_remlink(handlers, handler); - if(event->val!=EVT_FILESELECT_EXTERNAL_CANCEL) - if(screen != handler->filescreen) + if(event->val!=EVT_FILESELECT_EXTERNAL_CANCEL) { + if(screen != handler->filescreen) { ED_screen_full_prevspace(C, CTX_wm_area(C)); - else + } + else { ED_area_prevspace(C, CTX_wm_area(C)); + } + } wm_handler_op_context(C, handler); -- cgit v1.2.3