Merged changes in the trunk up to revision 33894.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 27 Dec 2010 01:38:23 +0000 (01:38 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Mon, 27 Dec 2010 01:38:23 +0000 (01:38 +0000)
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:

  blender_include_dirs(${OPENGL_INCLUDE_DIR})

The command above should be:

  blender_include_dirs("${OPENGL_INCLUDE_DIR}")

29 files changed:
1  2 
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/scene.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/CMakeLists.txt
source/blender/editors/render/render_shading.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/transform/transform.c
source/blender/freestyle/CMakeLists.txt
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c
source/blender/python/intern/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/render/intern/include/render_types.h
source/blender/render/intern/source/pipeline.c
source/creator/CMakeLists.txt

Simple merge
Simple merge
Simple merge
index 05f7fb63218ac612539fc6fd1fad875a723711c4,0000000000000000000000000000000000000000..3b051f3804a05ee37eee127ddab21d75f64ff1b8
mode 100644,000000..100644
--- /dev/null
@@@ -1,42 -1,0 +1,42 @@@
- FILE(GLOB_RECURSE SRC *.cpp *.h)
 +# $Id: CMakeLists.txt 14444 2008-04-16 22:40:48Z hos $
 +# ***** BEGIN GPL LICENSE BLOCK *****
 +#
 +# This program is free software; you can redistribute it and/or
 +# modify it under the terms of the GNU General Public License
 +# as published by the Free Software Foundation; either version 2
 +# of the License, or (at your option) any later version.
 +#
 +# This program is distributed in the hope that it will be useful,
 +# but WITHOUT ANY WARRANTY; without even the implied warranty of
 +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 +# GNU General Public License for more details.
 +#
 +# You should have received a copy of the GNU General Public License
 +# along with this program; if not, write to the Free Software Foundation,
 +# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 +#
 +# The Original Code is Copyright (C) 2006, Blender Foundation
 +# All rights reserved.
 +#
 +# The Original Code is: all of this file.
 +#
 +# Contributor(s): Jacques Beaurain.
 +#
 +# ***** END GPL LICENSE BLOCK *****
 +
- SET(INC 
++file(GLOB_RECURSE SRC *.cpp *.h)
 +
- IF(WIN32)
-       SET(INC ${INC} ${PTHREADS_INC})
- ENDIF(WIN32)
++set(INC 
 +  ../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna
 +  ../python ../python/intern
 +  ../render/extern/include ../render/intern/include ../include ../src
 +  ../../../extern/glew/include ../../../intern/guardedalloc ../freestyle
 +  ${PYTHON_INC}
 +  ${PNG_INC}
 +)
 +
- BLENDERLIB(bf_freestyle "${SRC}" "${INC}")
++if(WIN32)
++      set(INC ${INC} ${PTHREADS_INC})
++endif(WIN32)
 +
++blender_add_lib(bf_freestyle "${SRC}" "${INC}")
Simple merge
Simple merge
Simple merge