Merge of the COLLADA GSoC branch into trunk.
COLLADA code is disabled by default (it has dependencies requiring manual install).
SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch.
The detailed command log of the merge (can be useful for educational purposes):
branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
|
|
|
# ***** 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,
|
2010-02-12 13:34:04 +00:00
|
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
Merge of the COLLADA GSoC branch into trunk.
COLLADA code is disabled by default (it has dependencies requiring manual install).
SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch.
The detailed command log of the merge (can be useful for educational purposes):
branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
|
|
|
#
|
|
|
|
# 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 *****
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
remove_strict_flags()
|
2010-11-03 22:44:39 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
set(INC
|
2010-10-23 04:05:55 +00:00
|
|
|
.
|
|
|
|
../blenkernel
|
2011-07-17 09:11:13 +00:00
|
|
|
../blenlib
|
2011-02-21 12:35:04 +00:00
|
|
|
../blenloader
|
2011-07-17 09:11:13 +00:00
|
|
|
../editors/include
|
2010-10-23 04:05:55 +00:00
|
|
|
../makesdna
|
|
|
|
../makesrna
|
2011-07-17 09:11:13 +00:00
|
|
|
../windowmanager
|
2012-06-22 16:16:58 +00:00
|
|
|
../imbuf
|
2010-10-23 04:05:55 +00:00
|
|
|
../../../intern/guardedalloc
|
2009-11-02 14:03:13 +00:00
|
|
|
)
|
|
|
|
|
2011-05-31 01:15:44 +00:00
|
|
|
set(INC_SYS
|
2011-08-24 16:04:35 +00:00
|
|
|
${OPENCOLLADA_INCLUDE_DIRS}
|
2011-05-31 01:15:44 +00:00
|
|
|
)
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
set(SRC
|
2010-10-23 04:05:55 +00:00
|
|
|
AnimationImporter.cpp
|
2011-05-26 17:07:38 +00:00
|
|
|
AnimationExporter.cpp
|
2010-10-23 04:05:55 +00:00
|
|
|
ArmatureExporter.cpp
|
|
|
|
ArmatureImporter.cpp
|
|
|
|
CameraExporter.cpp
|
|
|
|
DocumentExporter.cpp
|
|
|
|
DocumentImporter.cpp
|
|
|
|
EffectExporter.cpp
|
2011-09-05 20:41:58 +00:00
|
|
|
ErrorHandler.cpp
|
2011-09-07 18:23:30 +00:00
|
|
|
ExportSettings.cpp
|
2011-03-23 14:25:35 +00:00
|
|
|
ExtraHandler.cpp
|
2011-03-25 11:07:57 +00:00
|
|
|
ExtraTags.cpp
|
2010-10-23 04:05:55 +00:00
|
|
|
GeometryExporter.cpp
|
|
|
|
ImageExporter.cpp
|
|
|
|
InstanceWriter.cpp
|
|
|
|
LightExporter.cpp
|
|
|
|
MaterialExporter.cpp
|
|
|
|
MeshImporter.cpp
|
|
|
|
SkinInfo.cpp
|
2011-09-06 22:18:12 +00:00
|
|
|
SceneExporter.cpp
|
2010-10-23 04:05:55 +00:00
|
|
|
TransformReader.cpp
|
|
|
|
TransformWriter.cpp
|
|
|
|
collada.cpp
|
|
|
|
collada_internal.cpp
|
|
|
|
collada_utils.cpp
|
2010-11-29 04:35:56 +00:00
|
|
|
|
|
|
|
AnimationImporter.h
|
2012-10-21 05:46:41 +00:00
|
|
|
AnimationExporter.h
|
2010-11-29 04:35:56 +00:00
|
|
|
ArmatureExporter.h
|
|
|
|
ArmatureImporter.h
|
|
|
|
CameraExporter.h
|
|
|
|
DocumentExporter.h
|
|
|
|
DocumentImporter.h
|
|
|
|
EffectExporter.h
|
2011-09-05 20:41:58 +00:00
|
|
|
ErrorHandler.h
|
2011-09-07 18:23:30 +00:00
|
|
|
ExportSettings.h
|
2011-03-23 14:25:35 +00:00
|
|
|
ExtraHandler.h
|
2011-03-25 11:07:57 +00:00
|
|
|
ExtraTags.h
|
2010-11-29 04:35:56 +00:00
|
|
|
GeometryExporter.h
|
|
|
|
ImageExporter.h
|
|
|
|
InstanceWriter.h
|
|
|
|
LightExporter.h
|
|
|
|
MaterialExporter.h
|
|
|
|
MeshImporter.h
|
|
|
|
SkinInfo.h
|
2011-09-06 22:18:12 +00:00
|
|
|
SceneExporter.h
|
2010-11-29 04:35:56 +00:00
|
|
|
TransformReader.h
|
|
|
|
TransformWriter.h
|
|
|
|
collada.h
|
|
|
|
collada_internal.h
|
|
|
|
collada_utils.h
|
Merge of the COLLADA GSoC branch into trunk.
COLLADA code is disabled by default (it has dependencies requiring manual install).
SCons and CMake builds are supported on Windows and Linux, no Mac building yet. More on building COLLADA code: http://wiki.blender.org/index.php/User:Kazanbas/Building_Collada_Branch.
The detailed command log of the merge (can be useful for educational purposes):
branch=https://svn.blender.org/svnroot/bf-blender/branches/soc-2009-chingachgook
# collada code
svn copy $branch/source/blender/collada source/blender/collada
# operator
svn merge -c 20401,20955,21077,24077,24079 $branch/source/blender/windowmanager/intern/wm_operators.c source/blender/windowmanager/intern/wm_operators.c
# menu
svn merge -c 24079 $branch/release/scripts/ui/space_info.py release/scripts/ui/space_info.py
# scons
svn merge -c 20398 $branch/source/blender/SConscript source/blender/SConscript
svn merge -c 20398,20691,20955,22726 $branch/tools/btools.py tools/btools.py
svn merge -c 20691,20955,22726 $branch/tools/Blender.py tools/Blender.py
svn merge -c 20398,20692,20955 $branch/config/linux2-config.py config/linux2-config.py
svn merge -c 22726 $branch/config/win64-vc-config.py config/win64-vc-config.py
svn merge -c 22726 $branch/config/win32-vc-config.py config/win32-vc-config.py
svn merge -c 24077 $branch/source/blender/windowmanager/SConscript source/blender/windowmanager/SConscript
# cmake
svn merge -c 23319,23905,24077,24158 $branch/CMakeLists.txt CMakeLists.txt
svn merge -c 23319 $branch/source/blender/CMakeLists.txt source/blender/CMakeLists.txt
svn merge -c 23319 $branch/source/creator/CMakeLists.txt source/creator/CMakeLists.txt
svn merge -c 23319 $branch/CMake/macros.cmake CMake/macros.cmake
svn merge -c 24077 $branch/source/blender/windowmanager/CMakeLists.txt source/blender/windowmanager/CMakeLists.txt
2009-10-30 15:35:50 +00:00
|
|
|
)
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WITH_BUILDINFO)
|
2011-08-22 16:54:26 +00:00
|
|
|
add_definitions(-DWITH_BUILDINFO)
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2010-08-26 06:58:32 +00:00
|
|
|
|
2011-02-12 06:25:04 +00:00
|
|
|
if(CMAKE_COMPILER_IS_GNUCXX)
|
|
|
|
# COLLADAFWArray.h gives error with gcc 4.5
|
|
|
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
|
|
|
|
endif()
|
|
|
|
|
2011-05-31 01:15:44 +00:00
|
|
|
blender_add_lib(bf_collada "${SRC}" "${INC}" "${INC_SYS}")
|