projects
/
blender-staging.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
96e6e6f
4b24951
)
Merge trunk up to revision 40611
author
Sergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 13:21:45 +0000
(13:21 +0000)
committer
Sergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 13:21:45 +0000
(13:21 +0000)
1
2
source/blender/blenkernel/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/interface/interface_templates.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/editors/space_view3d/view3d_view.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blender/makesrna/intern/rna_space.c
patch
|
diff1
|
diff2
|
blob
|
history
source/blenderplayer/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
source/creator/CMakeLists.txt
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/blender/blenkernel/CMakeLists.txt
index 96572f78da288019cbf0dce89cd12ed2c3e60e7a,917491430086445bf20698ffdc2340c60412defd..461574297424cd3c3f22cb20842260f52e775d93
---
1
/
source/blender/blenkernel/CMakeLists.txt
---
2
/
source/blender/blenkernel/CMakeLists.txt
+++ b/
source/blender/blenkernel/CMakeLists.txt
@@@
-368,13
-361,9
+368,14
@@@
if(WITH_GAMEENGINE
)
endif()
- if(MSVC)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
- endif()
+if(WITH_LIBMV)
+ list(APPEND INC ../../../extern/libmv)
+ add_definitions(-DWITH_LIBMV)
+endif()
+
+ ## Warnings as errors, this is too strict!
+ #if(MSVC)
+ # set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+ #endif()
blender_add_lib(bf_blenkernel "${SRC}" "${INC}" "${INC_SYS}")
diff --cc
source/blender/editors/interface/interface_templates.c
Simple merge
diff --cc
source/blender/editors/space_view3d/view3d_view.c
Simple merge
diff --cc
source/blender/makesrna/intern/rna_space.c
Simple merge
diff --cc
source/blenderplayer/CMakeLists.txt
Simple merge
diff --cc
source/creator/CMakeLists.txt
Simple merge