Merge trunk up to revision 40611
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 13:21:45 +0000 (13:21 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 27 Sep 2011 13:21:45 +0000 (13:21 +0000)
1  2 
source/blender/blenkernel/CMakeLists.txt
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/view3d_view.c
source/blender/makesrna/intern/rna_space.c
source/blenderplayer/CMakeLists.txt
source/creator/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}")
Simple merge
Simple merge