forked from bartvdbraak/blender
a42bf45333
discussed with Janne, Ton, Nathan and we agreed this kind of change at least needs discussion with module owners.
Its also too close to release to be making these kinds of changes.
commands used:
# reverse merge
svn merge -r36073:36072 .
# for some reason this gave a lot of property changes
svn revert `svn st | grep "^ M" | awk '{print $2}'`
# reverse merging didn't work here, removing while dir.
svn rm extern/eltopo/
# manually fixed conflict in
# ./source/blenderplayer/CMakeLists.txt
#
# also manually removed 2 lines from
# ./CMakeLists.txt
57 lines
1.4 KiB
CMake
57 lines
1.4 KiB
CMake
# $Id$
|
|
# ***** 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 *****
|
|
|
|
# Otherwise we get warnings here that we cant fix in external projects
|
|
remove_strict_flags()
|
|
|
|
if(WITH_BULLET)
|
|
add_subdirectory(bullet2)
|
|
endif()
|
|
|
|
if(WITH_BINRELOC)
|
|
add_subdirectory(binreloc)
|
|
endif()
|
|
|
|
if(WITH_BUILTIN_GLEW)
|
|
add_subdirectory(glew)
|
|
endif()
|
|
|
|
if(WITH_IMAGE_OPENJPEG AND (NOT UNIX OR APPLE))
|
|
add_subdirectory(libopenjpeg)
|
|
endif()
|
|
|
|
if(WITH_IMAGE_REDCODE)
|
|
add_subdirectory(libredcode)
|
|
endif()
|
|
|
|
if(WITH_LZO)
|
|
add_subdirectory(lzo)
|
|
endif()
|
|
|
|
if(WITH_LZMA)
|
|
add_subdirectory(lzma)
|
|
endif()
|