warning fixes and minor cmake changes.
authorCampbell Barton <ideasman42@gmail.com>
Sat, 18 Sep 2010 03:55:56 +0000 (03:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 18 Sep 2010 03:55:56 +0000 (03:55 +0000)
52 files changed:
extern/binreloc/CMakeLists.txt
extern/glew/CMakeLists.txt
extern/lzo/CMakeLists.txt
intern/boolop/CMakeLists.txt
intern/bsp/CMakeLists.txt
intern/container/CMakeLists.txt
intern/decimation/CMakeLists.txt
intern/elbeem/CMakeLists.txt
intern/guardedalloc/CMakeLists.txt
intern/iksolver/CMakeLists.txt
intern/itasc/CMakeLists.txt
intern/memutil/CMakeLists.txt
intern/moto/CMakeLists.txt
intern/opennl/CMakeLists.txt
intern/string/CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/effect.c
source/blender/blenloader/CMakeLists.txt
source/blender/blenpluginapi/CMakeLists.txt
source/blender/editors/render/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/screen/screen_edit.c
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/sound/CMakeLists.txt
source/blender/editors/space_action/CMakeLists.txt
source/blender/editors/space_api/CMakeLists.txt
source/blender/editors/space_buttons/CMakeLists.txt
source/blender/editors/space_console/CMakeLists.txt
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_graph/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_info/CMakeLists.txt
source/blender/editors/space_logic/CMakeLists.txt
source/blender/editors/space_nla/CMakeLists.txt
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_outliner/CMakeLists.txt
source/blender/editors/space_script/CMakeLists.txt
source/blender/editors/space_sequencer/CMakeLists.txt
source/blender/editors/space_sound/CMakeLists.txt
source/blender/editors/space_text/CMakeLists.txt
source/blender/editors/space_time/CMakeLists.txt
source/blender/editors/space_userpref/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/editors/transform/CMakeLists.txt
source/blender/editors/util/CMakeLists.txt
source/blender/editors/uvedit/CMakeLists.txt
source/blender/gpu/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/imbuf/intern/cineon/CMakeLists.txt
source/blender/imbuf/intern/dds/CMakeLists.txt
source/blender/makesdna/intern/CMakeLists.txt
source/blender/windowmanager/intern/wm_event_system.c

index c684a7602e1b6c441ad63be2835c4988e4dd8ddd..cc27b82ede1a8fb607bcbc78e16561863958ec83 100644 (file)
 # All rights reserved.
 #
 
-SET(INC ./include )
+SET(SRC
+       binreloc.c
+)
+
+SET(INC
+       ./include
+)
+
 ADD_DEFINITIONS(-DENABLE_BINRELOC)
-FILE(GLOB SRC *.c)
+
 
 BLENDERLIB(extern_binreloc "${SRC}" "${INC}")
index b22c7caaaaeebd6e2db2318de4d580f4f11e45f6..ea3c13da611a8f351f3d5893c2e67f7069c3b4bf 100644 (file)
@@ -24,7 +24,9 @@
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC include src)
+SET(INC
+       ./include
+)
 
 IF(UNIX)
        LIST(APPEND INC ${X11_X11_INCLUDE_PATH})
index 8bc887c923e620f9e1d4021f2d38a422ad735007..1563300d509991897184d16b6b06c9e1ef96fdf4 100644 (file)
 # ***** END GPL LICENSE BLOCK *****
 
 SET(INC include)
-
-FILE(GLOB SRC minilzo/*.c)
-
-
+SET(SRC minilzo/minilzo.c)
 
 BLENDERLIB(extern_minilzo "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
index 99923bc99dc21ae3476b7ec071f55f8418f3c7a7..91500712a4c3c96ff052cec3b16cbd7f4ad10d65 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC . intern extern ../moto/include ../container ../memutil ../../source/blender/makesdna ../guardedalloc ../../source/blender/blenlib)
+SET(INC        
+       .
+       ./intern
+       ./extern
+       ../memutil
+       ../container
+       ../guardedalloc
+       ../moto/include
+       ../../source/blender/blenlib
+       ../../source/blender/makesdna
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_bop "${SRC}" "${INC}")
-#, libtype='common', priority=5 )
index 4f87e161030005a27a5401edfd0147f0e12df072..debbc86c2409567c4a8ed0a63742eec5eabc576b 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC intern ../container ../moto/include ../memutil)
+SET(INC
+       ./intern
+       ../container
+       ../moto/include
+       ../memutil
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_bsp "${SRC}" "${INC}")
-#, libtype='core', priority=15 )
index 462b62ae8bb85fc9a0d7cd87b4ded21eb734da3e..9ae684ec54215893d68dbe9640210e96174485ae 100644 (file)
@@ -29,4 +29,3 @@ SET(INC .)
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_ctr "${SRC}" "${INC}")
-#, libtype=['intern'], priority = 10 )
index 7fdf08978a4057ec4fe0b2f0d1e22e6eaeb26e4b..77ab6249e7f349305af53c3f903aa1bdf6a714c8 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC . ../moto/include ../container ../memutil)
+SET(INC
+       .
+       ../container
+       ../memutil
+       ../moto/include
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_decimate "${SRC}" "${INC}")
-#, libtype=['core','common','player'], priority = [10, 20, 25] )
index d0e100907b18d6fcac53ae6e70b8b73a1cf31e86..57fb6180adbacce5d85836c8fdde3863e0038957 100644 (file)
@@ -38,4 +38,3 @@ IF(WITH_OPENMP)
 ENDIF(WITH_OPENMP)
 
 BLENDERLIB_NOLIST(bf_intern_elbeem "${SRC}" "${INC}")
-#, libtype='blender', priority=0 )
index 642b04fdb60fafeb33cf60940fb8f97aadbc6990..29e4f553974a226ae15ecdfa19234bc1981c0a6a 100644 (file)
 
 SET(INC .)
 
-FILE(GLOB SRC intern/*.c)
+SET(SRC
+       ./intern/mallocn.c
+)
+
+IF(WIN32)
+       LIST(APPEND SRC ./intern/mmap_win.c)
+ENDIF(WIN32)
 
 BLENDERLIB(bf_intern_guardedalloc "${SRC}" "${INC}")
 
-# Override C++ alloc optional
+# Override C++ alloc, optional.
 IF(WITH_CXX_GUARDEDALLOC)
-       FILE(GLOB SRC cpp/*.cpp)
+       SET(SRC cpp/mallocn.cpp)
        BLENDERLIB(bf_intern_guardedalloc_cpp "${SRC}" "${INC}")
 ENDIF(WITH_CXX_GUARDEDALLOC)
index 8ea05ac994dc0e75877a54598efadbdc5767d656..50ae78d6d16ef0ab774e6e53c7177d737d081afa 100644 (file)
 #
 # ***** END GPL LICENSE BLOCK *****
 
-SET(INC intern ../moto/include ../memutil)
+SET(INC
+       intern
+       ../memutil
+       ../moto/include
+)
 
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_ik "${SRC}" "${INC}")
-#, libtype=['blender'], priority = [10] )
index 39443bd2b22921c5dd386f141289e7a30f2495f2..88f902b38c896f5a3b1affa8ec6730361d88eca6 100644 (file)
@@ -29,4 +29,3 @@ SET(INC ../../extern/Eigen2)
 FILE(GLOB SRC *.cpp kdl/*.cpp kdl/utilities/*.cpp)
 
 BLENDERLIB(bf_intern_itasc "${SRC}" "${INC}")
-#, libtype=['blender'], priority = [10] )
index 3dc725acb506db8fbd9fa1c627e05d2fe93be43a..ebbc53403f484cf45abf64d156c80dc35201abe2 100644 (file)
@@ -26,7 +26,9 @@
 
 SET(INC . ..)
 
-FILE(GLOB SRC intern/*.cpp)
+SET(SRC
+       ./intern/MEM_CacheLimiterC-Api.cpp
+       ./intern/MEM_RefCountedC-Api.cpp
+)
 
 BLENDERLIB(bf_intern_memutil "${SRC}" "${INC}")
-#, libtype=['intern', 'player'], priority = [0, 180] )
index 3d6d3d1a783486b168df600de3e33bdd46f830e7..91c523eced9085452b73e68dd7da629e57744c33 100644 (file)
@@ -29,4 +29,3 @@ SET(INC include)
 FILE(GLOB SRC intern/*.cpp)
 
 BLENDERLIB(bf_intern_moto "${SRC}" "${INC}")
-#, libtype=['intern','game','game2','player'], priority = [15, 55, 100, 135] )
index 0551c94e586c0c2650c4a49ef8ec98a8fc322b83..b29eaa680b615332cd6281fa5ab0563c18457899 100644 (file)
@@ -29,5 +29,3 @@ SET(INC extern superlu)
 FILE(GLOB SRC intern/*.c superlu/*.c)
 
 BLENDERLIB(bf_intern_opennl "${SRC}" "${INC}")
-#, libtype='core', priority=55 )
-
index 7aeace4ca836613275e642f7146e1bd281a424b4..a1b130d93be4056757564b18574e0a0703a74b8a 100644 (file)
@@ -25,8 +25,6 @@
 # ***** END GPL LICENSE BLOCK *****
 
 SET(INC .)
-
-FILE(GLOB SRC intern/*.cpp)
+SET(SRC ./intern/STR_String.cpp)
 
 BLENDERLIB(bf_intern_string "${SRC}" "${INC}")
-#, libtype=['core', 'player'], priority = [30,10] )
index 155d14fb5a1a67809293bc2a5a489d539d5409bd..ccead684a889f92d9ebd19b9b274712002c46e4b 100644 (file)
@@ -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
index 0da5e0da2c4398df32462b6bd3b4769575bfd247..4860e7d8eedb03858a7710c26474428a8b7c6f30 100644 (file)
@@ -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"
index cae0fccd12a89be3c389cfc07debbea01c0bf9ac..cc70d3355f29e980c07ad2db5e74dfd5cf3c10fc 100644 (file)
 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}
 )
 
index 42aa5eddc42a0fe402e9737006e10648d5f7418e..3abf1e44449ca44344abdc50a73e69ba82216d7f 100644 (file)
 FILE(GLOB SRC intern/*.c)
 
 SET(INC 
-       . .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna
+       .
+       ..
+       ../blenlib
+       ../imbuf
+       ../makesdna
+       ../../../intern/guardedalloc
 )
 
 IF(WIN32)
index 322e69ca84361b3dce9eb0549da7fcd854cd1a07..d494355a1e9e47391e1f9b2e54a8a65919b6a72c 100644 (file)
 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)
 
index b6a8e27449bf570da780d5f80849185b2ec9ad17..f7dfd81dba91a37d3e75819372cd819ef23bbdc7 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenfont
        ../../blenkernel
        ../../blenlib
        ../../imbuf
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 IF(WIN32)
index 1ca8bff319314d39106a0510d3adde280159d578..eb70eef988cf8e4fa78a25330303cc71449a87d6 100644 (file)
@@ -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"
 
index fb8382e10ca530e0173330fb855297e648707909..3211763b619dddd4bdc3db2c5fd42409251995d0 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../imbuf
        ../../gpu
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
        ../../render/extern/include
+       ../../../../intern/guardedalloc
 )
 
 IF(WIN32)
index 02765726c6e9c6ea37394849432b6d3b97fea9c0..456c02d947e0be66f887718704138af9ee196679 100644 (file)
 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}")
index 85275b2db23a339d6bd6819c00ef74afd5bccb6e..3c0585c31ca2f820aa2340e66c4595e5a11b0912 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
-
 BLENDERLIB(bf_editor_space_action "${SRC}" "${INC}")
index 591e97f800fed8d52ed15c89bb67bb54b67f0b00..da140fe0982a81083226d66d19339c9d4d292b38 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 BLENDERLIB(bf_editor_space_api "${SRC}" "${INC}")
index bb50ac0cc86337390a8e33c53043f016026d3e31..f8e9536ecf88cf8df16902e540aeb6b95af2f6f6 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 BLENDERLIB(bf_editor_space_buttons "${SRC}" "${INC}")
index 0cee45576b8b712aa24d795a8d36329efa0efb9d..59074bcbb796dcafa7625d29251f8796d953a335 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenfont
        ../../blenkernel
        ../../blenlib
        ../../blenloader
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 IF(NOT WITH_PYTHON)
index 207d83b56c662d0298395b39b5d63ef90f228f18..2a204d675375f19a78e0a3a4f41c591aba27af46 100644 (file)
 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)
index 6ad95d920c606fd82665e8555bd1487db6fe0d7e..33ddbcea0197c7d86c2315db3ab5fe8b7dd5bb35 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
 )
 
index 1c0a97767b70bf985742d3bd36a1cce3513ec773..d47f5a9820eb6eefdd299d19629b6b017b4e1ed0 100644 (file)
 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)
index aa9a40ac98f8fb77d65d4ea6b302c641025f4f27..9d439c4ec00546ec656c44c32b1e04f7662c7920 100644 (file)
 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}")
index 91087d57f11565e3e51916786d55cc1a03960efa..6f0a260124d323e9ec0d986ee62f50da67224d75 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
        ../../editors/interface
+       ../../../../intern/guardedalloc
 )
 
 IF(WITH_GAMEENGINE)
index be8020b07932e5b57f3b31fc00923bac2ffbce29..6bb656cba8cbc425159f4a329c2871f6d3a17dd3 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 BLENDERLIB(bf_editor_space_nla "${SRC}" "${INC}")
index 06dd2257147b3ec3837851a53d9981901d7430ea..ae298a611e9feecdeb3c0a7099588dfd1891c52f 100644 (file)
 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)
index 78c4fcbdd8d7a0f15a6d1b688c0218595cb8326e..5ebe47f8c5e2605239a4aff377d0fd6330dc545d 100644 (file)
 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}")
index 58b3affe2d41474dae25a3611a2ee9483a54dd49..7abaa4db4412092ba6ee75b131e76eb5b1b96320 100644 (file)
 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)
index 383cc05b7f7b7bd07534d8b15b0b76710cf66099..fa99d35a7cde464212b4fd7b5ed9438fbe56fa7c 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
        ../../imbuf
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
        ../../../../intern/audaspace/intern
 )
 
index 60c8f5e44bde36d52f6bb9c5e4a2470a6ef1ff17..c78fc11a9088102e25a566c606f9c7422c8ccf76 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 BLENDERLIB(bf_editor_space_sound "${SRC}" "${INC}")
index 0616cf5147a0f8a2fb3ac0cc60f3770227a4c510..eabf508b5f677f5b9534fc1d43ffc420bf97d828 100644 (file)
 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)
index 39b7ba355b95e0e5d3268dc9923f72ad00d97fb7..4da42ec1f42fb13673982bd270f4c8b356b3fdb1 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 BLENDERLIB(bf_editor_space_time "${SRC}" "${INC}")
index 1752f39cfa59d91037c599df867f5c350c7c4585..d57661bb166460391fca2bab6f1ae2905c6b9d4b 100644 (file)
@@ -25,10 +25,10 @@ SET(INC
        ../include
        ../../blenkernel
        ../../blenlib
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 BLENDERLIB(bf_editor_space_userpref "${SRC}" "${INC}")
index ca9ad001a40115285416e35a5fb3d56d77428513..4874789898158f7ce177bebcf1ed90a63f8e6a35 100644 (file)
@@ -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)
 
index e67771270cf659b4deccbc17a0a6641b087a1816..e28ed89c80c05261547c6e9c77ff9461e11d14ea 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 BLENDERLIB(bf_editor_transform "${SRC}" "${INC}")
index b4b2fd12cefc85dbf191f631dff3bf2782ad1d2e..be700b17b7a4cbb2d85f90b6863edf7dec3f79ad 100644 (file)
 FILE(GLOB SRC *.c)
 
 SET(INC
+       ../include
        ../../blenkernel
        ../../blenlib
-       ../include
-       ../../../../intern/guardedalloc
        ../../makesdna
        ../../makesrna
        ../../windowmanager
+       ../../../../intern/guardedalloc
 )
 
 BLENDERLIB(bf_editor_util "${SRC}" "${INC}")
index 297863b2a9f0a98ed7f7aeca6363c221699211a0..36cd1274ec7c04f2a5c033b4bda0aa456c43bd12 100644 (file)
 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}")
index 126cddf852ffabd881109cb8155eac8c4520ec50..5de7b0c5281db9f85726d07d991afae6bc09fed3 100644 (file)
 
 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})
index c0023d49c956448f49ccb8d513ce9724893bbb01..699ed6e1b0031b81c6dc746266095baedbe373ec 100644 (file)
@@ -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}
index cd887b6fc4eca5884c2d85a76a569e7ba00c6e81..5633d2a66f6ef464747794caf86af127d4eb690a 100644 (file)
@@ -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}")
index 376dd3d61f44e20c0b44139abfdcc4b884f8a06f..620d4041703c1841590ea14a6dec608d26ad9e27 100644 (file)
@@ -28,12 +28,12 @@ FILE (GLOB SRC *.cpp)
 
 SET(INC 
        .
-       ../../../blenkernel
-       ../../../makesdna
-       ../../
        ..
+       ./intern/include
+       ../../
        ../../../blenlib
-       intern/include
+       ../../../blenkernel
+       ../../../makesdna
        ../../../../../intern/guardedalloc
 )
 
index 0eb42373d6df668b8b32c6d9ce423c8ed12f65a9..d42289e17c49ee2c1fbb5686f74eb6ab496d3e65 100644 (file)
@@ -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
index 9e7606a9f14bee3aadb60e03fa8940e4426b517d..2f3c56b9184a25ef3a2b319b6d75d230b5f52732 100644 (file)
@@ -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);