2008-01-07 19:13:47 +00:00
|
|
|
# ***** BEGIN GPL LICENSE BLOCK *****
|
2006-11-17 02:27:12 +00:00
|
|
|
#
|
|
|
|
|
# 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
|
2008-01-07 19:13:47 +00:00
|
|
|
# of the License, or (at your option) any later version.
|
2006-11-17 02:27:12 +00:00
|
|
|
#
|
|
|
|
|
# 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.
|
2006-11-17 02:27:12 +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.
|
|
|
|
|
#
|
2008-01-07 19:13:47 +00:00
|
|
|
# ***** END GPL LICENSE BLOCK *****
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
setup_libdirs()
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2010-12-22 22:15:20 +00:00
|
|
|
blender_include_dirs(
|
2010-06-06 13:32:58 +00:00
|
|
|
../../intern/guardedalloc
|
2009-09-06 01:51:23 +00:00
|
|
|
../blender/blenlib
|
|
|
|
|
../blender/blenkernel
|
2011-02-21 13:00:38 +00:00
|
|
|
../blender/blenloader
|
2009-09-06 01:51:23 +00:00
|
|
|
../blender/editors/include
|
|
|
|
|
../blender/makesrna
|
|
|
|
|
../blender/imbuf
|
|
|
|
|
../blender/render/extern/include
|
|
|
|
|
../blender/makesdna
|
|
|
|
|
../blender/gpu
|
|
|
|
|
../blender/windowmanager
|
2006-11-17 02:27:12 +00:00
|
|
|
)
|
|
|
|
|
|
2012-03-20 02:17:37 +00:00
|
|
|
if(WIN32)
|
|
|
|
|
blender_include_dirs(../../intern/utfconv)
|
|
|
|
|
endif()
|
|
|
|
|
|
2011-11-07 12:55:18 +00:00
|
|
|
if(WITH_LIBMV)
|
|
|
|
|
blender_include_dirs(../../extern/libmv)
|
|
|
|
|
add_definitions(-DWITH_LIBMV)
|
|
|
|
|
endif()
|
|
|
|
|
|
2012-03-30 10:37:49 +00:00
|
|
|
if(WITH_CODEC_FFMPEG)
|
|
|
|
|
add_definitions(-DWITH_FFMPEG)
|
|
|
|
|
endif()
|
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WITH_PYTHON)
|
2010-12-22 22:15:20 +00:00
|
|
|
blender_include_dirs(../blender/python)
|
2010-12-08 08:43:06 +00:00
|
|
|
add_definitions(-DWITH_PYTHON)
|
2011-04-28 06:20:47 +00:00
|
|
|
|
|
|
|
|
if(WITH_PYTHON_SECURITY)
|
|
|
|
|
add_definitions(-DWITH_PYTHON_SECURITY)
|
|
|
|
|
endif()
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2008-12-31 05:20:35 +00:00
|
|
|
|
2011-06-04 14:12:55 +00:00
|
|
|
if(WITH_HEADLESS)
|
|
|
|
|
add_definitions(-DWITH_HEADLESS)
|
|
|
|
|
endif()
|
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WITH_GAMEENGINE)
|
2011-05-06 20:18:42 +00:00
|
|
|
blender_include_dirs(../gameengine/BlenderRoutines)
|
2010-11-03 01:56:02 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
add_definitions(-DWITH_GAMEENGINE)
|
|
|
|
|
endif()
|
2010-10-31 00:56:46 +00:00
|
|
|
|
2011-10-20 00:19:21 +00:00
|
|
|
if(WITH_SDL)
|
|
|
|
|
add_definitions(-DWITH_SDL)
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2009-07-20 10:24:53 +00:00
|
|
|
|
2011-02-21 13:13:08 +00:00
|
|
|
if(WITH_BINRELOC)
|
2010-12-08 08:43:06 +00:00
|
|
|
add_definitions(-DWITH_BINRELOC)
|
2011-06-18 14:12:54 +00:00
|
|
|
blender_include_dirs(${BINRELOC_INCLUDE_DIRS})
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2007-01-23 20:08:23 +00:00
|
|
|
|
2012-12-20 07:57:26 +00:00
|
|
|
if(WITH_FREESTYLE)
|
|
|
|
|
add_definitions(-DWITH_FREESTYLE)
|
|
|
|
|
blender_include_dirs(../blender/freestyle)
|
|
|
|
|
endif()
|
|
|
|
|
|
2009-09-24 15:36:00 +00:00
|
|
|
# Setup the exe sources and buildinfo
|
2010-12-08 08:43:06 +00:00
|
|
|
set(SRC
|
2010-11-29 04:35:56 +00:00
|
|
|
creator.c
|
|
|
|
|
)
|
2006-12-06 00:28:13 +00:00
|
|
|
|
2011-04-09 00:10:29 +00:00
|
|
|
# MSVC 2010 gives linking errors with the manifest
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WIN32 AND NOT UNIX)
|
2011-03-29 13:00:03 +00:00
|
|
|
string(SUBSTRING ${BLENDER_VERSION} 0 1 bver1)
|
|
|
|
|
string(SUBSTRING ${BLENDER_VERSION} 2 1 bver2)
|
|
|
|
|
string(SUBSTRING ${BLENDER_VERSION} 3 1 bver3)
|
2011-04-09 23:25:52 +00:00
|
|
|
if(MINGW)
|
|
|
|
|
add_definitions(
|
|
|
|
|
-DWINDRES
|
|
|
|
|
-DBLEN_VER_RC_STR_M=${BLENDER_VERSION}
|
|
|
|
|
-DBLEN_VER_RC_1=${bver1}
|
|
|
|
|
-DBLEN_VER_RC_2=${bver2}
|
|
|
|
|
-DBLEN_VER_RC_3=${bver3}
|
|
|
|
|
-DBLEN_VER_RC_4=0
|
|
|
|
|
)
|
|
|
|
|
else()
|
|
|
|
|
add_definitions(
|
|
|
|
|
-DBLEN_VER_RC_STR=${BLENDER_VERSION}
|
|
|
|
|
-DBLEN_VER_RC_1=${bver1}
|
|
|
|
|
-DBLEN_VER_RC_2=${bver2}
|
|
|
|
|
-DBLEN_VER_RC_3=${bver3}
|
|
|
|
|
-DBLEN_VER_RC_4=0
|
|
|
|
|
)
|
|
|
|
|
endif()
|
2011-09-30 15:51:58 +00:00
|
|
|
|
2011-03-29 13:00:03 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
list(APPEND SRC
|
2010-11-29 04:35:56 +00:00
|
|
|
../icons/winblender.rc
|
|
|
|
|
)
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2006-11-17 02:27:12 +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)
|
2011-02-24 17:57:35 +00:00
|
|
|
# --------------------------------------------------------------------------
|
|
|
|
|
# These defines could all be moved into the header below
|
2010-12-08 08:43:06 +00:00
|
|
|
string(REPLACE " " "\ " BUILDINFO_CFLAGS "${CMAKE_C_FLAGS}")
|
|
|
|
|
string(REPLACE " " "\ " BUILDINFO_CXXFLAGS "${CMAKE_CXX_FLAGS}")
|
|
|
|
|
string(REPLACE " " "\ " BUILDINFO_LINKFLAGS "${PLATFORM_LINKFLAGS}")
|
|
|
|
|
add_definitions(
|
2011-02-24 17:57:35 +00:00
|
|
|
# # define in header now, else these get out of date on rebuilds.
|
|
|
|
|
# -DBUILD_DATE="${BUILD_DATE}"
|
|
|
|
|
# -DBUILD_TIME="${BUILD_TIME}"
|
|
|
|
|
# -DBUILD_REV="${BUILD_REV}"
|
|
|
|
|
-DWITH_BUILDINFO_HEADER # alternative to lines above
|
2010-09-07 01:13:10 +00:00
|
|
|
-DBUILD_PLATFORM="${CMAKE_SYSTEM_NAME}"
|
|
|
|
|
-DBUILD_TYPE="${CMAKE_BUILD_TYPE}"
|
2010-10-19 05:00:36 +00:00
|
|
|
-DBUILD_CFLAGS="${BUILDINFO_CFLAGS}"
|
|
|
|
|
-DBUILD_CXXFLAGS="${BUILDINFO_CXXFLAGS}"
|
|
|
|
|
-DBUILD_LINKFLAGS="${BUILDINFO_LINKFLAGS}"
|
|
|
|
|
-DBUILD_SYSTEM="CMake"
|
2010-09-07 01:13:10 +00:00
|
|
|
)
|
|
|
|
|
|
2011-02-24 17:57:35 +00:00
|
|
|
# --------------------------------------------------------------------------
|
|
|
|
|
# write header for values that change each build
|
|
|
|
|
# note, generaed file is in build dir's source/creator
|
|
|
|
|
# except when used as an include path.
|
|
|
|
|
|
|
|
|
|
# include the output directory, where the buildinfo.h file is generated
|
|
|
|
|
include_directories(${CMAKE_BINARY_DIR}/source/creator)
|
2011-02-25 02:27:54 +00:00
|
|
|
|
2011-02-24 17:57:35 +00:00
|
|
|
# a custom target that is always built
|
|
|
|
|
add_custom_target(buildinfo ALL
|
|
|
|
|
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h)
|
|
|
|
|
|
|
|
|
|
# creates svnheader.h using cmake script
|
|
|
|
|
add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
|
|
|
|
|
COMMAND ${CMAKE_COMMAND}
|
|
|
|
|
-DSOURCE_DIR=${CMAKE_SOURCE_DIR}
|
|
|
|
|
-P ${CMAKE_SOURCE_DIR}/build_files/cmake/buildinfo.cmake)
|
|
|
|
|
|
|
|
|
|
# buildinfo.h is a generated file
|
|
|
|
|
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/buildinfo.h
|
|
|
|
|
PROPERTIES GENERATED TRUE
|
|
|
|
|
HEADER_FILE_ONLY TRUE)
|
2011-03-07 03:57:04 +00:00
|
|
|
|
2011-02-25 02:27:54 +00:00
|
|
|
# add deps below, after adding blender
|
2011-02-24 17:57:35 +00:00
|
|
|
# -------------- done with header values.
|
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
list(APPEND SRC
|
2010-11-29 04:35:56 +00:00
|
|
|
buildinfo.c
|
|
|
|
|
)
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2009-09-24 15:36:00 +00:00
|
|
|
|
2010-12-16 12:48:30 +00:00
|
|
|
# message(STATUS "Configuring blender")
|
2011-02-20 23:39:29 +00:00
|
|
|
if(WITH_PYTHON_MODULE)
|
|
|
|
|
add_definitions(-DWITH_PYTHON_MODULE)
|
|
|
|
|
|
|
|
|
|
# creates ./bin/bpy.so which can be imported as a python module.
|
2012-01-11 00:09:46 +00:00
|
|
|
#
|
|
|
|
|
# note that 'SHARED' works on Linux and Windows,
|
|
|
|
|
# but not OSX which _must_ be 'MODULE'
|
|
|
|
|
add_library(blender MODULE ${SRC})
|
2011-02-20 23:39:29 +00:00
|
|
|
set_target_properties(
|
|
|
|
|
blender
|
|
|
|
|
PROPERTIES
|
2011-05-30 10:51:37 +00:00
|
|
|
PREFIX ""
|
|
|
|
|
OUTPUT_NAME bpy
|
|
|
|
|
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin
|
|
|
|
|
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin # only needed on windows
|
2011-02-20 23:39:29 +00:00
|
|
|
)
|
2011-09-30 15:51:58 +00:00
|
|
|
|
2012-01-16 14:13:41 +00:00
|
|
|
if(APPLE)
|
|
|
|
|
set_target_properties(
|
|
|
|
|
blender
|
|
|
|
|
PROPERTIES
|
|
|
|
|
LINK_FLAGS_RELEASE "${PLATFORM_LINKFLAGS}"
|
|
|
|
|
LINK_FLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG}"
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
2011-03-27 23:11:22 +00:00
|
|
|
if(WIN32)
|
|
|
|
|
# python modules use this
|
|
|
|
|
set_target_properties(
|
|
|
|
|
blender
|
|
|
|
|
PROPERTIES
|
2011-05-09 14:41:44 +00:00
|
|
|
SUFFIX ".pyd"
|
2011-09-30 15:51:58 +00:00
|
|
|
)
|
2011-03-27 23:11:22 +00:00
|
|
|
endif()
|
2011-09-30 15:51:58 +00:00
|
|
|
|
2011-02-20 23:39:29 +00:00
|
|
|
else()
|
|
|
|
|
add_executable(blender ${EXETYPE} ${SRC})
|
|
|
|
|
endif()
|
2009-09-24 15:36:00 +00:00
|
|
|
|
2011-02-24 17:57:35 +00:00
|
|
|
if(WITH_BUILDINFO)
|
|
|
|
|
# explicitly say that the executable depends on the buildinfo
|
|
|
|
|
add_dependencies(blender buildinfo)
|
|
|
|
|
endif()
|
2006-12-10 14:49:28 +00:00
|
|
|
|
|
|
|
|
# Post build steps for bundling/packaging.
|
|
|
|
|
|
2011-03-07 03:33:33 +00:00
|
|
|
|
2011-04-21 12:07:40 +00:00
|
|
|
if(MSVC_IDE)
|
2011-03-07 03:33:33 +00:00
|
|
|
# ${CMAKE_CFG_INTDIR} should replace \${BUILD_TYPE} when using add_command
|
|
|
|
|
set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
|
2011-03-07 21:28:36 +00:00
|
|
|
elseif(APPLE)
|
2011-03-16 15:44:17 +00:00
|
|
|
set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH}/\${BUILD_TYPE})
|
2011-03-07 03:33:33 +00:00
|
|
|
else()
|
|
|
|
|
set(TARGETDIR ${EXECUTABLE_OUTPUT_PATH})
|
|
|
|
|
endif()
|
2006-12-10 17:09:48 +00:00
|
|
|
|
2011-07-01 13:10:49 +00:00
|
|
|
set(BLENDER_TEXT_FILES
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/text/Python-license.txt
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/text/copyright.txt
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/text/readme.html
|
|
|
|
|
)
|
|
|
|
|
|
2006-12-10 17:09:48 +00:00
|
|
|
|
2011-11-17 18:23:34 +00:00
|
|
|
# -----------------------------------------------------------------------------
|
2012-03-21 05:33:37 +00:00
|
|
|
# Platform Specific Var: TARGETDIR_VER
|
2011-11-17 18:23:34 +00:00
|
|
|
|
|
|
|
|
if(UNIX AND NOT APPLE)
|
2011-03-17 09:09:48 +00:00
|
|
|
if(WITH_INSTALL_PORTABLE)
|
|
|
|
|
set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
|
|
|
|
|
else()
|
2011-05-24 18:34:07 +00:00
|
|
|
if(WITH_PYTHON_MODULE)
|
|
|
|
|
set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
|
|
|
|
|
else()
|
|
|
|
|
set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
|
|
|
|
|
endif()
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
2011-03-06 11:41:30 +00:00
|
|
|
|
2011-11-17 18:23:34 +00:00
|
|
|
elseif(WIN32)
|
|
|
|
|
set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
|
|
|
|
|
|
|
|
|
|
elseif(APPLE)
|
2012-01-16 14:13:41 +00:00
|
|
|
if(WITH_PYTHON_MODULE)
|
|
|
|
|
set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
|
|
|
|
|
else()
|
|
|
|
|
set(TARGETDIR_VER ${TARGETDIR}/blender.app/Contents/MacOS/${BLENDER_VERSION})
|
|
|
|
|
endif()
|
2011-11-17 18:23:34 +00:00
|
|
|
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
# Install Targets (Generic, All Platforms)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# important to make a clean install each time, else old scripts get loaded.
|
|
|
|
|
install(
|
|
|
|
|
CODE
|
|
|
|
|
"file(REMOVE_RECURSE ${TARGETDIR_VER})"
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if(WITH_PYTHON)
|
|
|
|
|
# install(CODE "message(\"copying blender scripts...\")")
|
2011-11-17 19:43:59 +00:00
|
|
|
|
|
|
|
|
# exclude addons_contrib if release
|
|
|
|
|
if("${BLENDER_VERSION_CYCLE}" STREQUAL "release")
|
|
|
|
|
set(ADDON_EXCLUDE_CONDITIONAL "addons_contrib/*")
|
|
|
|
|
else()
|
|
|
|
|
set(ADDON_EXCLUDE_CONDITIONAL "_addons_contrib/*") # dummy, wont do anything
|
|
|
|
|
endif()
|
|
|
|
|
|
2012-12-20 07:57:26 +00:00
|
|
|
# do not install freestyle dir if disabled
|
|
|
|
|
if(NOT WITH_FREESTYLE)
|
|
|
|
|
set(FREESTYLE_EXCLUDE_CONDITIONAL "freestyle/*")
|
|
|
|
|
else()
|
|
|
|
|
set(FREESTYLE_EXCLUDE_CONDITIONAL "_freestyle/*") # dummy, wont do anything
|
|
|
|
|
endif()
|
|
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
install(
|
2011-11-17 18:23:34 +00:00
|
|
|
DIRECTORY ${CMAKE_SOURCE_DIR}/release/scripts
|
|
|
|
|
DESTINATION ${TARGETDIR_VER}
|
|
|
|
|
PATTERN ".svn" EXCLUDE
|
|
|
|
|
PATTERN "__pycache__" EXCLUDE
|
2011-11-17 19:43:59 +00:00
|
|
|
PATTERN "${ADDON_EXCLUDE_CONDITIONAL}" EXCLUDE
|
2012-12-20 07:57:26 +00:00
|
|
|
PATTERN "${FREESTYLE_EXCLUDE_CONDITIONAL}" EXCLUDE
|
2011-03-17 09:09:48 +00:00
|
|
|
)
|
2011-11-17 19:43:59 +00:00
|
|
|
|
|
|
|
|
unset(ADDON_EXCLUDE_CONDITIONAL)
|
2012-12-20 07:57:26 +00:00
|
|
|
unset(FREESTYLE_EXCLUDE_CONDITIONAL)
|
2011-11-17 18:23:34 +00:00
|
|
|
endif()
|
2011-03-06 11:41:30 +00:00
|
|
|
|
2011-11-17 18:23:34 +00:00
|
|
|
# localization
|
|
|
|
|
if(WITH_INTERNATIONAL)
|
2011-03-17 09:09:48 +00:00
|
|
|
install(
|
2011-11-17 18:23:34 +00:00
|
|
|
DIRECTORY
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/datafiles/locale
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/datafiles/fonts
|
|
|
|
|
DESTINATION ${TARGETDIR_VER}/datafiles
|
|
|
|
|
PATTERN ".svn" EXCLUDE
|
2011-03-17 09:09:48 +00:00
|
|
|
)
|
2011-11-17 18:23:34 +00:00
|
|
|
endif()
|
2011-03-06 11:41:30 +00:00
|
|
|
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
# color management
|
|
|
|
|
if(WITH_OPENCOLORIO)
|
|
|
|
|
install(
|
|
|
|
|
DIRECTORY ${CMAKE_SOURCE_DIR}/release/datafiles/colormanagement
|
|
|
|
|
DESTINATION ${TARGETDIR_VER}/datafiles
|
|
|
|
|
PATTERN ".svn" EXCLUDE
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
2011-11-17 18:23:34 +00:00
|
|
|
# helpful tip when using make
|
|
|
|
|
if("${CMAKE_GENERATOR}" MATCHES ".*Makefiles.*")
|
2011-03-17 09:09:48 +00:00
|
|
|
# message after building.
|
|
|
|
|
add_custom_command(
|
|
|
|
|
TARGET blender POST_BUILD MAIN_DEPENDENCY blender
|
2011-11-20 00:37:24 +00:00
|
|
|
COMMAND ${CMAKE_COMMAND} -E echo 'now run: \"make install\" to copy runtime files and scripts to ${TARGETDIR_VER}'
|
2011-03-17 09:09:48 +00:00
|
|
|
)
|
2011-11-17 18:23:34 +00:00
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
# Install Targets (Platform Specific)
|
|
|
|
|
|
|
|
|
|
if(UNIX AND NOT APPLE)
|
2011-03-06 11:41:30 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
# there are a few differences between portable and system install
|
|
|
|
|
if(WITH_INSTALL_PORTABLE)
|
2010-12-08 08:43:06 +00:00
|
|
|
install(
|
2011-03-17 09:09:48 +00:00
|
|
|
FILES
|
2011-05-30 10:51:37 +00:00
|
|
|
${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
|
|
|
|
|
${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
|
2011-03-17 09:09:48 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2009-09-06 01:51:23 +00:00
|
|
|
)
|
|
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
install(
|
|
|
|
|
PROGRAMS
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
|
|
|
|
|
DESTINATION ${TARGETDIR}
|
2011-03-09 21:19:15 +00:00
|
|
|
)
|
|
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
install(
|
2011-07-01 13:10:49 +00:00
|
|
|
FILES ${BLENDER_TEXT_FILES}
|
2011-03-17 09:09:48 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
|
|
|
|
)
|
2011-03-06 11:41:30 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
else()
|
|
|
|
|
# main blender binary
|
2011-05-24 18:34:07 +00:00
|
|
|
if(WITH_PYTHON_MODULE)
|
|
|
|
|
install(
|
2011-05-26 12:15:42 +00:00
|
|
|
TARGETS blender
|
|
|
|
|
LIBRARY
|
2011-05-24 18:34:07 +00:00
|
|
|
DESTINATION ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages
|
|
|
|
|
)
|
|
|
|
|
else()
|
|
|
|
|
install(
|
|
|
|
|
PROGRAMS ${TARGETDIR}/blender
|
|
|
|
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
2011-03-06 11:41:30 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(WITH_GAMEENGINE AND WITH_PLAYER)
|
2011-03-06 11:41:30 +00:00
|
|
|
install(
|
2011-03-17 09:09:48 +00:00
|
|
|
PROGRAMS ${TARGETDIR}/blenderplayer
|
2011-03-06 11:41:30 +00:00
|
|
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
|
|
|
|
|
)
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2011-03-06 11:41:30 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
# misc files
|
2010-12-08 08:43:06 +00:00
|
|
|
install(
|
2011-03-17 09:09:48 +00:00
|
|
|
FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop
|
|
|
|
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications
|
2010-07-26 19:59:33 +00:00
|
|
|
)
|
2011-03-17 09:09:48 +00:00
|
|
|
install(
|
2011-04-21 06:37:54 +00:00
|
|
|
DIRECTORY
|
2011-05-30 10:51:37 +00:00
|
|
|
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/16x16
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/22x22
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/24x24
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/32x32
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/48x48
|
|
|
|
|
${CMAKE_SOURCE_DIR}/release/freedesktop/icons/256x256
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor
|
2011-04-21 06:37:54 +00:00
|
|
|
PATTERN ".svn" EXCLUDE
|
|
|
|
|
PATTERN "*.svg" EXCLUDE
|
|
|
|
|
)
|
|
|
|
|
install(
|
|
|
|
|
FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/icons/scalable/apps/blender.svg
|
|
|
|
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps
|
2009-09-06 01:51:23 +00:00
|
|
|
)
|
2011-03-17 09:09:48 +00:00
|
|
|
install(
|
|
|
|
|
PROGRAMS ${CMAKE_SOURCE_DIR}/release/bin/blender-thumbnailer.py
|
|
|
|
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
|
|
|
|
|
)
|
|
|
|
|
install(
|
|
|
|
|
FILES ${CMAKE_SOURCE_DIR}/doc/manpage/blender.1
|
|
|
|
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1
|
|
|
|
|
)
|
|
|
|
|
install(
|
2011-07-01 13:10:49 +00:00
|
|
|
FILES ${BLENDER_TEXT_FILES}
|
2011-03-17 09:09:48 +00:00
|
|
|
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/blender
|
2011-03-07 03:33:33 +00:00
|
|
|
)
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
2011-03-08 09:01:22 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(WITH_PYTHON)
|
|
|
|
|
if(WITH_PYTHON_INSTALL)
|
2012-02-15 08:53:28 +00:00
|
|
|
# on some platforms (like openSUSE) Python is linked
|
|
|
|
|
# to be used from lib64 folder.
|
|
|
|
|
# determine this from Python's libraries path
|
|
|
|
|
if(${PYTHON_LIBPATH} MATCHES "lib64$")
|
|
|
|
|
set(_target_LIB "lib64")
|
|
|
|
|
else()
|
|
|
|
|
set(_target_LIB "lib")
|
|
|
|
|
endif()
|
|
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
# Copy the systems python into the install directory
|
|
|
|
|
# Scons copy in tools/Blender.py
|
|
|
|
|
# install(CODE "message(\"copying a subset of the systems python...\")")
|
2011-03-06 11:41:30 +00:00
|
|
|
install(
|
2011-03-17 09:09:48 +00:00
|
|
|
DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
|
2012-02-15 08:53:28 +00:00
|
|
|
DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}
|
2011-03-06 11:41:30 +00:00
|
|
|
PATTERN ".svn" EXCLUDE
|
2011-05-26 11:45:25 +00:00
|
|
|
PATTERN "__pycache__" EXCLUDE # * any cache *
|
2011-03-17 09:09:48 +00:00
|
|
|
PATTERN "distutils" EXCLUDE # ./distutils
|
|
|
|
|
PATTERN "lib2to3" EXCLUDE # ./lib2to3
|
|
|
|
|
PATTERN "config" EXCLUDE # ./config
|
|
|
|
|
PATTERN "config-*" EXCLUDE # ./config-*
|
|
|
|
|
PATTERN "site-packages/*" EXCLUDE # ./site-packages/*
|
|
|
|
|
PATTERN "tkinter" EXCLUDE # ./tkinter
|
|
|
|
|
PATTERN "lib-dynload/_tkinter.*" EXCLUDE # ./lib-dynload/_tkinter.co
|
2011-05-26 11:45:25 +00:00
|
|
|
PATTERN "idlelib" EXCLUDE # ./idlelib
|
2011-03-17 09:09:48 +00:00
|
|
|
PATTERN "test" EXCLUDE # ./test
|
|
|
|
|
PATTERN "turtledemo" EXCLUDE # ./turtledemo
|
2011-05-26 11:45:25 +00:00
|
|
|
PATTERN "turtle.py" EXCLUDE # ./turtle.py
|
2009-09-06 01:51:23 +00:00
|
|
|
)
|
2011-03-06 11:41:30 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
# # doesnt work, todo
|
|
|
|
|
# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
|
2012-04-30 09:38:32 +00:00
|
|
|
|
|
|
|
|
if(WITH_PYTHON_INSTALL_NUMPY)
|
|
|
|
|
install(
|
2012-05-02 14:16:35 +00:00
|
|
|
DIRECTORY ${PYTHON_NUMPY_PATH}/numpy
|
2012-04-30 09:38:32 +00:00
|
|
|
DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}/python${PYTHON_VERSION}/site-packages
|
|
|
|
|
PATTERN ".svn" EXCLUDE
|
|
|
|
|
PATTERN "__pycache__" EXCLUDE # * any cache *
|
|
|
|
|
PATTERN "*.pyc" EXCLUDE # * any cache *
|
|
|
|
|
PATTERN "*.pyo" EXCLUDE # * any cache *
|
|
|
|
|
PATTERN "distutils" EXCLUDE # ./distutils
|
|
|
|
|
PATTERN "oldnumeric" EXCLUDE # ./oldnumeric
|
|
|
|
|
PATTERN "doc" EXCLUDE # ./doc
|
|
|
|
|
PATTERN "tests" EXCLUDE # ./tests
|
|
|
|
|
PATTERN "f2py" EXCLUDE # ./f2py - fortran/python interface code, not fun for blender devs.
|
|
|
|
|
PATTERN "include" EXCLUDE # include dirs all over, we wont use NumPy/CAPI
|
|
|
|
|
PATTERN "*.h" EXCLUDE # some includes are not in include dirs
|
|
|
|
|
PATTERN "*.a" EXCLUDE # ./core/lib/libnpymath.a - for linking, we dont need.
|
|
|
|
|
)
|
|
|
|
|
endif()
|
|
|
|
|
|
2012-02-15 08:53:28 +00:00
|
|
|
unset(_target_LIB)
|
2012-04-30 09:38:32 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
|
|
|
|
elseif(WIN32)
|
2009-09-21 03:16:26 +00:00
|
|
|
|
2011-11-17 18:23:34 +00:00
|
|
|
install(
|
2011-07-02 07:55:06 +00:00
|
|
|
FILES ${BLENDER_TEXT_FILES}
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2011-03-17 09:09:48 +00:00
|
|
|
)
|
2011-03-07 03:33:33 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(WITH_PYTHON)
|
2012-08-04 20:25:04 +00:00
|
|
|
set_lib_path(PYLIB "python")
|
2012-11-26 12:38:40 +00:00
|
|
|
|
2013-03-24 12:13:13 +00:00
|
|
|
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
|
2012-11-26 12:38:40 +00:00
|
|
|
|
2011-05-30 10:39:18 +00:00
|
|
|
install(
|
2012-11-26 12:38:40 +00:00
|
|
|
FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}.dll
|
2011-05-30 10:39:18 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
|
|
|
|
CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel
|
|
|
|
|
)
|
2011-03-07 03:33:33 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
install(
|
2012-11-26 12:38:40 +00:00
|
|
|
FILES ${PYLIB}/lib/python${_PYTHON_VERSION_NO_DOTS}_d.dll
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2011-03-17 09:09:48 +00:00
|
|
|
CONFIGURATIONS Debug
|
|
|
|
|
)
|
2011-03-07 03:33:33 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(WITH_PYTHON_INSTALL)
|
2011-05-24 05:21:51 +00:00
|
|
|
# note, as far as python is concerned 'RelWithDebInfo' is not debug since its without debug flags.
|
2011-03-07 03:33:33 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
# create the directory in multiple steps, so it actually gets created when it doesn't exist yet
|
2011-03-07 03:33:33 +00:00
|
|
|
install(
|
2011-03-17 09:09:48 +00:00
|
|
|
CODE
|
|
|
|
|
"
|
2011-05-24 05:21:51 +00:00
|
|
|
message(\"creating ${TARGETDIR_VER}/python/lib\")
|
2011-05-26 11:45:25 +00:00
|
|
|
file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python\")
|
|
|
|
|
file(MAKE_DIRECTORY \"${TARGETDIR_VER}/python/lib\")
|
2011-05-24 05:21:51 +00:00
|
|
|
message(\"done creating dir\")
|
2011-03-17 09:09:48 +00:00
|
|
|
"
|
2010-09-15 14:36:32 +00:00
|
|
|
)
|
2011-03-07 03:33:33 +00:00
|
|
|
|
|
|
|
|
install(
|
2011-03-17 09:09:48 +00:00
|
|
|
CODE
|
|
|
|
|
"
|
2011-05-30 10:39:18 +00:00
|
|
|
if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" STREQUAL \"Debug\")
|
|
|
|
|
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
|
2012-11-26 12:38:40 +00:00
|
|
|
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}_d.tar.gz\")
|
2011-05-30 10:39:18 +00:00
|
|
|
else()
|
|
|
|
|
execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\"
|
2012-11-26 12:38:40 +00:00
|
|
|
\"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python${_PYTHON_VERSION_NO_DOTS}.tar.gz\")
|
2011-05-30 10:39:18 +00:00
|
|
|
endif()
|
2011-03-17 09:09:48 +00:00
|
|
|
"
|
2010-09-15 14:36:32 +00:00
|
|
|
)
|
2009-09-06 01:51:23 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
# doesnt work, todo
|
|
|
|
|
# install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2012-11-26 12:38:40 +00:00
|
|
|
|
|
|
|
|
unset(_PYTHON_VERSION_NO_DOTS)
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
2009-09-06 01:51:23 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(CMAKE_CL_64)
|
2012-11-11 16:54:26 +00:00
|
|
|
# png is statically linked on win64
|
2011-03-17 09:09:48 +00:00
|
|
|
install(
|
|
|
|
|
FILES ${LIBDIR}/zlib/lib/zlib.dll
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2011-03-17 09:09:48 +00:00
|
|
|
)
|
|
|
|
|
else()
|
2012-04-23 20:09:59 +00:00
|
|
|
#not needed since we link statically, maybe also unneeded for MinGW?
|
|
|
|
|
if(NOT WITH_MINGW64)
|
|
|
|
|
install(
|
|
|
|
|
FILES
|
|
|
|
|
${LIBDIR}/zlib/lib/zlib.dll
|
|
|
|
|
DESTINATION ${TARGETDIR}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
2011-03-07 03:57:04 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(MSVC)
|
|
|
|
|
install(
|
|
|
|
|
FILES ${LIBDIR}/pthreads/lib/pthreadVC2.dll
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2011-03-17 09:09:48 +00:00
|
|
|
)
|
|
|
|
|
else()
|
2012-04-23 20:09:59 +00:00
|
|
|
#MinGW64 comes with own version. For portable builds it will probaly have to be copied to work
|
|
|
|
|
if(NOT WITH_MINGW64)
|
|
|
|
|
install(
|
|
|
|
|
FILES ${LIBDIR}/pthreads/lib/pthreadGC2.dll
|
|
|
|
|
DESTINATION ${TARGETDIR}
|
|
|
|
|
)
|
2012-05-01 20:57:39 +00:00
|
|
|
elseif(WITH_MINGW64)
|
|
|
|
|
install(
|
2012-07-05 11:39:11 +00:00
|
|
|
FILES
|
|
|
|
|
${LIBDIR}/binaries/libgcc_s_sjlj-1.dll
|
|
|
|
|
${LIBDIR}/binaries/libwinpthread-1.dll
|
|
|
|
|
${LIBDIR}/binaries/libstdc++-6.dll
|
2012-05-01 20:57:39 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
|
|
|
|
)
|
2012-07-05 11:39:11 +00:00
|
|
|
|
|
|
|
|
if(WITH_OPENMP)
|
|
|
|
|
install(
|
|
|
|
|
FILES
|
|
|
|
|
${LIBDIR}/binaries/libgomp-1.dll
|
|
|
|
|
DESTINATION ${TARGETDIR}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
2012-04-23 20:09:59 +00:00
|
|
|
endif()
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
2009-09-06 01:51:23 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(WITH_CODEC_FFMPEG)
|
|
|
|
|
install(
|
|
|
|
|
FILES
|
2011-08-22 18:49:42 +00:00
|
|
|
${LIBDIR}/ffmpeg/lib/avcodec-53.dll
|
|
|
|
|
${LIBDIR}/ffmpeg/lib/avformat-53.dll
|
|
|
|
|
${LIBDIR}/ffmpeg/lib/avdevice-53.dll
|
|
|
|
|
${LIBDIR}/ffmpeg/lib/avutil-51.dll
|
|
|
|
|
${LIBDIR}/ffmpeg/lib/swscale-2.dll
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2011-03-17 09:09:48 +00:00
|
|
|
)
|
2012-05-10 11:37:41 +00:00
|
|
|
if(WITH_MINGW64)
|
|
|
|
|
install(
|
|
|
|
|
FILES
|
|
|
|
|
${LIBDIR}/ffmpeg/lib/swresample-0.dll
|
|
|
|
|
${LIBDIR}/ffmpeg/lib/xvidcore.dll
|
|
|
|
|
DESTINATION ${TARGETDIR}
|
|
|
|
|
)
|
|
|
|
|
endif()
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
2009-09-06 01:51:23 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(WITH_CODEC_SNDFILE)
|
2011-03-16 15:44:17 +00:00
|
|
|
install(
|
2011-05-30 10:51:37 +00:00
|
|
|
FILES ${LIBDIR}/sndfile/lib/libsndfile-1.dll
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2011-03-09 00:23:26 +00:00
|
|
|
)
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
2011-03-09 00:23:26 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(WITH_OPENAL)
|
|
|
|
|
install(
|
|
|
|
|
FILES
|
2011-05-30 10:51:37 +00:00
|
|
|
${LIBDIR}/openal/lib/OpenAL32.dll
|
2012-02-17 16:58:34 +00:00
|
|
|
${LIBDIR}/openal/lib/wrap_oal.dll
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2011-03-16 15:44:17 +00:00
|
|
|
)
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
2011-03-16 15:44:17 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
if(WITH_SDL)
|
|
|
|
|
if(NOT CMAKE_CL_64)
|
2011-03-07 03:33:33 +00:00
|
|
|
install(
|
2011-05-30 10:51:37 +00:00
|
|
|
FILES ${LIBDIR}/sdl/lib/SDL.dll
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2009-09-06 01:51:23 +00:00
|
|
|
)
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2011-03-17 09:09:48 +00:00
|
|
|
endif()
|
2009-09-06 01:51:23 +00:00
|
|
|
|
2011-05-09 14:41:44 +00:00
|
|
|
if(NOT CMAKE_CL_64)
|
2011-04-01 06:39:19 +00:00
|
|
|
install(
|
2011-05-30 10:51:37 +00:00
|
|
|
FILES ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}
|
2011-05-09 14:41:44 +00:00
|
|
|
)
|
|
|
|
|
endif()
|
2011-10-07 18:25:54 +00:00
|
|
|
|
|
|
|
|
install( # x86 builds can run on x64 Windows, so this is required at all times
|
|
|
|
|
FILES ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
|
|
|
|
|
DESTINATION ${TARGETDIR}
|
2012-11-15 19:37:29 +00:00
|
|
|
)
|
2011-11-07 15:53:40 +00:00
|
|
|
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
if(WITH_OPENCOLORIO)
|
2012-09-25 15:11:34 +00:00
|
|
|
set(OCIOBIN ${LIBDIR}/opencolorio/bin)
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
if(NOT MINGW)
|
|
|
|
|
install(
|
|
|
|
|
FILES
|
|
|
|
|
${OCIOBIN}/OpenColorIO.dll
|
|
|
|
|
DESTINATION ${TARGETDIR}
|
|
|
|
|
)
|
2012-09-23 18:50:56 +00:00
|
|
|
else()
|
|
|
|
|
install(
|
|
|
|
|
FILES
|
|
|
|
|
${OCIOBIN}/libOpenColorIO.dll
|
|
|
|
|
DESTINATION ${TARGETDIR}
|
|
|
|
|
)
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
endif()
|
|
|
|
|
endif()
|
|
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
elseif(APPLE)
|
2010-11-21 13:41:43 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
# handy install macro to exclude files, we use \$ escape for the "to"
|
|
|
|
|
# argument when calling so ${BUILD_TYPE} does not get expanded
|
|
|
|
|
macro(install_dir from to)
|
2011-03-16 15:44:17 +00:00
|
|
|
install(
|
2011-03-17 09:09:48 +00:00
|
|
|
DIRECTORY ${from}
|
|
|
|
|
DESTINATION ${to}
|
|
|
|
|
PATTERN ".svn" EXCLUDE
|
|
|
|
|
PATTERN "*.pyc" EXCLUDE
|
|
|
|
|
PATTERN "*.pyo" EXCLUDE
|
|
|
|
|
PATTERN "*.orig" EXCLUDE
|
|
|
|
|
PATTERN "*.rej" EXCLUDE
|
|
|
|
|
PATTERN "__pycache__" EXCLUDE
|
|
|
|
|
PATTERN "__MACOSX" EXCLUDE
|
|
|
|
|
PATTERN ".DS_Store" EXCLUDE
|
2011-03-09 00:23:26 +00:00
|
|
|
)
|
2011-03-17 09:09:48 +00:00
|
|
|
endmacro()
|
2011-03-09 00:23:26 +00:00
|
|
|
|
2012-11-18 07:41:38 +00:00
|
|
|
set(OSX_APP_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blender.app)
|
2011-11-17 18:23:34 +00:00
|
|
|
|
|
|
|
|
# setup Info.plist
|
|
|
|
|
execute_process(COMMAND date "+%Y-%m-%d" OUTPUT_VARIABLE BLENDER_DATE OUTPUT_STRIP_TRAILING_WHITESPACE)
|
|
|
|
|
|
|
|
|
|
set_target_properties(blender PROPERTIES
|
|
|
|
|
MACOSX_BUNDLE_INFO_PLIST ${OSX_APP_SOURCEDIR}/Contents/Info.plist
|
|
|
|
|
MACOSX_BUNDLE_SHORT_VERSION_STRING ${BLENDER_VERSION}
|
|
|
|
|
MACOSX_BUNDLE_LONG_VERSION_STRING "${BLENDER_VERSION} ${BLENDER_DATE}")
|
|
|
|
|
|
|
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
# install release and app files
|
2011-07-01 13:10:49 +00:00
|
|
|
install(
|
|
|
|
|
FILES ${BLENDER_TEXT_FILES}
|
|
|
|
|
DESTINATION ${TARGETDIR}
|
2011-03-17 09:09:48 +00:00
|
|
|
)
|
2011-03-07 03:57:04 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
install(
|
2011-11-17 18:23:34 +00:00
|
|
|
FILES ${OSX_APP_SOURCEDIR}/Contents/PkgInfo
|
2011-05-26 11:45:25 +00:00
|
|
|
DESTINATION ${TARGETDIR}/blender.app/Contents
|
2011-03-17 09:09:48 +00:00
|
|
|
)
|
2011-03-07 03:57:04 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
install_dir(
|
2011-11-17 18:23:34 +00:00
|
|
|
${OSX_APP_SOURCEDIR}/Contents/Resources
|
2011-03-17 09:09:48 +00:00
|
|
|
\${TARGETDIR}/blender.app/Contents/
|
|
|
|
|
)
|
2011-03-07 03:57:04 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
# python
|
2013-02-22 22:24:38 +00:00
|
|
|
if(WITH_PYTHON AND NOT WITH_PYTHON_MODULE AND NOT WITH_PYTHON_FRAMEWORK)
|
2011-03-17 09:09:48 +00:00
|
|
|
# the python zip is first extract as part of the build process,
|
|
|
|
|
# and then later installed as part of make install. this is much
|
|
|
|
|
# quicker, and means we can easily exclude files on copy
|
2012-01-17 13:11:53 +00:00
|
|
|
# Not needed for PYTHON_MODULE or WEB_PLUGIN due uses Pyhon framework
|
2011-03-17 09:09:48 +00:00
|
|
|
add_custom_target(
|
|
|
|
|
extractpyzip
|
|
|
|
|
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/python)
|
2011-03-07 03:57:04 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
set(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip")
|
2011-09-30 15:51:58 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
add_custom_command(
|
|
|
|
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
|
|
|
|
|
COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
|
|
|
|
|
COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
|
|
|
|
|
COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
|
|
|
|
|
DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
|
2011-09-30 15:51:58 +00:00
|
|
|
|
2011-03-17 09:09:48 +00:00
|
|
|
add_dependencies(blender extractpyzip)
|
|
|
|
|
|
|
|
|
|
# copy extracted python files
|
|
|
|
|
install_dir(
|
|
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/python
|
|
|
|
|
\${TARGETDIR_VER}
|
|
|
|
|
)
|
2011-03-07 03:57:04 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2012-09-24 19:25:32 +00:00
|
|
|
|
2011-09-26 05:26:04 +00:00
|
|
|
# install blenderplayer bundle - copy of blender.app above. re-using macros et al
|
2011-09-26 07:54:30 +00:00
|
|
|
# note we are using OSX Bundle as base and copying Blender dummy bundle on top of it
|
2011-09-26 05:26:04 +00:00
|
|
|
if(WITH_GAMEENGINE AND WITH_PLAYER)
|
2012-11-18 07:41:38 +00:00
|
|
|
set(OSX_APP_PLAYER_SOURCEDIR ${CMAKE_SOURCE_DIR}/release/darwin/blenderplayer.app)
|
2011-11-17 18:23:34 +00:00
|
|
|
set(PLAYER_SOURCEINFO ${OSX_APP_PLAYER_SOURCEDIR}/Contents/Info.plist)
|
2011-09-27 10:51:57 +00:00
|
|
|
set(PLAYER_TARGETDIR_VER ${TARGETDIR}/blenderplayer.app/Contents/MacOS/${BLENDER_VERSION})
|
2011-09-26 05:26:04 +00:00
|
|
|
|
|
|
|
|
|
2011-09-27 10:51:57 +00:00
|
|
|
# important to make a clean install each time else old scripts get loaded.
|
2011-09-26 05:26:04 +00:00
|
|
|
install(
|
|
|
|
|
CODE
|
2011-09-27 10:51:57 +00:00
|
|
|
"file(REMOVE_RECURSE ${PLAYER_TARGETDIR_VER})"
|
2011-09-26 05:26:04 +00:00
|
|
|
)
|
2011-09-27 10:51:57 +00:00
|
|
|
|
2011-09-26 05:26:04 +00:00
|
|
|
install(
|
2011-11-17 18:23:34 +00:00
|
|
|
FILES ${OSX_APP_PLAYER_SOURCEDIR}/Contents/PkgInfo
|
2011-09-26 05:26:04 +00:00
|
|
|
DESTINATION ${TARGETDIR}/blenderplayer.app/Contents
|
|
|
|
|
)
|
2011-09-30 15:51:58 +00:00
|
|
|
|
2011-09-26 05:26:04 +00:00
|
|
|
install_dir(
|
2011-11-17 18:23:34 +00:00
|
|
|
${OSX_APP_PLAYER_SOURCEDIR}/Contents/Resources
|
2011-09-26 05:26:04 +00:00
|
|
|
\${TARGETDIR}/blenderplayer.app/Contents/
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
# python
|
2013-02-22 22:24:38 +00:00
|
|
|
if(WITH_PYTHON AND NOT WITH_PYTHON_FRAMEWORK)
|
2011-09-26 05:26:04 +00:00
|
|
|
add_custom_command(
|
|
|
|
|
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/python
|
|
|
|
|
COMMAND rm -rf ${CMAKE_CURRENT_BINARY_DIR}/python/
|
|
|
|
|
COMMAND mkdir ${CMAKE_CURRENT_BINARY_DIR}/python/
|
|
|
|
|
COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${CMAKE_CURRENT_BINARY_DIR}/python/
|
|
|
|
|
DEPENDS ${LIBDIR}/release/${PYTHON_ZIP})
|
2011-09-30 15:51:58 +00:00
|
|
|
|
2011-09-26 05:26:04 +00:00
|
|
|
# copy extracted python files
|
|
|
|
|
install_dir(
|
|
|
|
|
${CMAKE_CURRENT_BINARY_DIR}/python
|
2011-09-27 10:51:57 +00:00
|
|
|
\${PLAYER_TARGETDIR_VER}
|
2011-09-26 05:26:04 +00:00
|
|
|
)
|
|
|
|
|
endif()
|
2011-09-27 10:51:57 +00:00
|
|
|
|
2011-09-26 05:26:04 +00:00
|
|
|
endif()
|
2012-09-24 19:25:32 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
endif()
|
2006-12-10 14:49:28 +00:00
|
|
|
|
2011-11-17 18:23:34 +00:00
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
# Generic Install, for all targets
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2011-11-07 15:53:40 +00:00
|
|
|
# install more files specified elsewhere
|
|
|
|
|
delayed_do_install(${TARGETDIR_VER})
|
|
|
|
|
|
2011-07-01 13:10:49 +00:00
|
|
|
unset(BLENDER_TEXT_FILES)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# -----------------------------------------------------------------------------
|
|
|
|
|
# Setup link libs
|
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
add_dependencies(blender makesdna)
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
get_property(BLENDER_LINK_LIBS GLOBAL PROPERTY BLENDER_LINK_LIBS)
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2013-01-03 06:47:44 +00:00
|
|
|
list(APPEND BLENDER_LINK_LIBS
|
2011-09-14 01:02:57 +00:00
|
|
|
bf_windowmanager
|
|
|
|
|
bf_render
|
|
|
|
|
)
|
2008-09-30 05:05:50 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WITH_MOD_FLUID)
|
|
|
|
|
list(APPEND BLENDER_LINK_LIBS bf_intern_elbeem)
|
|
|
|
|
endif()
|
2006-11-17 02:27:12 +00:00
|
|
|
|
2011-08-25 12:50:52 +00:00
|
|
|
if(WITH_CYCLES)
|
|
|
|
|
list(APPEND BLENDER_LINK_LIBS
|
|
|
|
|
cycles_render
|
|
|
|
|
cycles_bvh
|
|
|
|
|
cycles_device
|
|
|
|
|
cycles_kernel
|
|
|
|
|
cycles_util
|
|
|
|
|
cycles_subd)
|
2012-09-03 11:38:18 +00:00
|
|
|
if(WITH_CYCLES_OSL)
|
|
|
|
|
list(APPEND BLENDER_LINK_LIBS cycles_kernel_osl)
|
|
|
|
|
endif()
|
2011-08-25 12:50:52 +00:00
|
|
|
endif()
|
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
#if(UNIX)
|
2009-09-06 01:51:23 +00:00
|
|
|
# Sort libraries
|
2010-12-08 08:43:06 +00:00
|
|
|
set(BLENDER_SORTED_LIBS
|
2009-09-06 01:51:23 +00:00
|
|
|
bf_windowmanager
|
2010-06-04 11:34:57 +00:00
|
|
|
|
2010-09-01 05:39:26 +00:00
|
|
|
bf_editor_space_api
|
|
|
|
|
bf_editor_space_action
|
|
|
|
|
bf_editor_space_buttons
|
|
|
|
|
bf_editor_space_console
|
|
|
|
|
bf_editor_space_file
|
|
|
|
|
bf_editor_space_graph
|
|
|
|
|
bf_editor_space_image
|
|
|
|
|
bf_editor_space_info
|
|
|
|
|
bf_editor_space_logic
|
|
|
|
|
bf_editor_space_nla
|
|
|
|
|
bf_editor_space_node
|
|
|
|
|
bf_editor_space_outliner
|
|
|
|
|
bf_editor_space_script
|
|
|
|
|
bf_editor_space_sequencer
|
|
|
|
|
bf_editor_space_time
|
|
|
|
|
bf_editor_space_userpref
|
|
|
|
|
bf_editor_space_view3d
|
2011-11-07 12:55:18 +00:00
|
|
|
bf_editor_space_clip
|
2010-09-01 05:39:26 +00:00
|
|
|
|
|
|
|
|
bf_editor_text
|
|
|
|
|
bf_editor_transform
|
|
|
|
|
bf_editor_util
|
|
|
|
|
bf_editor_uvedit
|
|
|
|
|
bf_editor_curve
|
|
|
|
|
bf_editor_gpencil
|
|
|
|
|
bf_editor_interface
|
|
|
|
|
bf_editor_mesh
|
|
|
|
|
bf_editor_metaball
|
|
|
|
|
bf_editor_object
|
2013-02-28 00:45:07 +00:00
|
|
|
bf_editor_armature
|
2010-09-01 05:39:26 +00:00
|
|
|
bf_editor_physics
|
|
|
|
|
bf_editor_render
|
|
|
|
|
bf_editor_screen
|
|
|
|
|
bf_editor_sculpt_paint
|
|
|
|
|
bf_editor_sound
|
|
|
|
|
bf_editor_animation
|
|
|
|
|
bf_editor_datafiles
|
2012-06-04 16:42:58 +00:00
|
|
|
bf_editor_mask
|
2012-06-17 23:13:39 +00:00
|
|
|
bf_editor_io
|
2010-06-04 11:34:57 +00:00
|
|
|
|
2011-03-07 03:57:04 +00:00
|
|
|
bf_render
|
|
|
|
|
bf_intern_opennl
|
|
|
|
|
bf_python
|
|
|
|
|
bf_python_ext
|
2011-07-15 04:01:47 +00:00
|
|
|
bf_python_mathutils
|
2012-02-22 09:19:53 +00:00
|
|
|
bf_python_bmesh
|
2010-08-18 04:15:14 +00:00
|
|
|
bf_freestyle
|
2009-09-25 16:27:12 +00:00
|
|
|
bf_ikplugin
|
2010-04-11 22:12:30 +00:00
|
|
|
bf_modifiers
|
2012-03-15 23:56:46 +00:00
|
|
|
bf_bmesh
|
2010-04-25 01:10:03 +00:00
|
|
|
bf_blenkernel
|
2009-09-06 01:51:23 +00:00
|
|
|
bf_nodes
|
|
|
|
|
bf_gpu
|
2010-04-11 22:12:30 +00:00
|
|
|
bf_blenloader
|
2011-12-21 14:35:48 +00:00
|
|
|
bf_imbuf
|
2010-07-04 22:43:51 +00:00
|
|
|
bf_blenlib
|
2010-08-24 04:29:23 +00:00
|
|
|
bf_intern_ghost
|
|
|
|
|
bf_intern_string
|
2011-03-07 03:57:04 +00:00
|
|
|
bf_avi
|
|
|
|
|
bf_imbuf_cineon
|
|
|
|
|
bf_imbuf_openexr
|
2010-11-18 11:42:05 +00:00
|
|
|
bf_imbuf_dds
|
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
|
|
|
bf_collada
|
2011-03-07 03:57:04 +00:00
|
|
|
bf_intern_bsp
|
|
|
|
|
bf_intern_elbeem
|
|
|
|
|
bf_intern_memutil
|
|
|
|
|
bf_intern_guardedalloc
|
|
|
|
|
bf_intern_ctr
|
2012-03-20 02:17:37 +00:00
|
|
|
bf_intern_utfconv
|
2011-03-07 03:57:04 +00:00
|
|
|
ge_blen_routines
|
|
|
|
|
ge_converter
|
2010-11-18 11:42:05 +00:00
|
|
|
ge_phys_dummy
|
2011-03-07 03:57:04 +00:00
|
|
|
ge_phys_bullet
|
2010-08-24 04:29:23 +00:00
|
|
|
bf_intern_smoke
|
|
|
|
|
extern_minilzo
|
|
|
|
|
extern_lzma
|
2011-10-23 17:52:20 +00:00
|
|
|
extern_colamd
|
2011-03-07 03:57:04 +00:00
|
|
|
ge_logic_ketsji
|
2011-09-14 01:02:57 +00:00
|
|
|
extern_recastnavigation
|
2011-03-07 03:57:04 +00:00
|
|
|
ge_logic
|
|
|
|
|
ge_rasterizer
|
|
|
|
|
ge_oglrasterizer
|
|
|
|
|
ge_logic_expressions
|
|
|
|
|
ge_scenegraph
|
|
|
|
|
ge_logic_network
|
|
|
|
|
ge_logic_ngnetwork
|
|
|
|
|
ge_logic_loopbacknetwork
|
|
|
|
|
bf_intern_moto
|
2010-08-24 04:29:23 +00:00
|
|
|
extern_openjpeg
|
2010-11-30 18:52:39 +00:00
|
|
|
extern_redcode
|
2010-11-18 11:42:05 +00:00
|
|
|
ge_videotex
|
2009-09-06 01:51:23 +00:00
|
|
|
bf_rna
|
|
|
|
|
bf_dna
|
|
|
|
|
bf_blenfont
|
2010-08-24 04:29:23 +00:00
|
|
|
bf_intern_audaspace
|
2011-02-15 12:37:15 +00:00
|
|
|
bf_intern_mikktspace
|
2011-12-30 21:11:40 +00:00
|
|
|
bf_intern_dualcon
|
2011-08-25 12:50:52 +00:00
|
|
|
bf_intern_cycles
|
|
|
|
|
cycles_render
|
|
|
|
|
cycles_bvh
|
|
|
|
|
cycles_device
|
|
|
|
|
cycles_kernel
|
|
|
|
|
cycles_util
|
|
|
|
|
cycles_subd
|
2012-06-04 16:42:58 +00:00
|
|
|
bf_intern_raskter
|
Color Management, Stage 2: Switch color pipeline to use OpenColorIO
Replace old color pipeline which was supporting linear/sRGB color spaces
only with OpenColorIO-based pipeline.
This introduces two configurable color spaces:
- Input color space for images and movie clips. This space is used to convert
images/movies from color space in which file is saved to Blender's linear
space (for float images, byte images are not internally converted, only input
space is stored for such images and used later).
This setting could be found in image/clip data block settings.
- Display color space which defines space in which particular display is working.
This settings could be found in scene's Color Management panel.
When render result is being displayed on the screen, apart from converting image
to display space, some additional conversions could happen.
This conversions are:
- View, which defines tone curve applying before display transformation.
These are different ways to view the image on the same display device.
For example it could be used to emulate film view on sRGB display.
- Exposure affects on image exposure before tone map is applied.
- Gamma is post-display gamma correction, could be used to match particular
display gamma.
- RGB curves are user-defined curves which are applying before display
transformation, could be used for different purposes.
All this settings by default are only applying on render result and does not
affect on other images. If some particular image needs to be affected by this
transformation, "View as Render" setting of image data block should be set to
truth. Movie clips are always affected by all display transformations.
This commit also introduces configurable color space in which sequencer is
working. This setting could be found in scene's Color Management panel and
it should be used if such stuff as grading needs to be done in color space
different from sRGB (i.e. when Film view on sRGB display is use, using VD16
space as sequencer's internal space would make grading working in space
which is close to the space using for display).
Some technical notes:
- Image buffer's float buffer is now always in linear space, even if it was
created from 16bit byte images.
- Space of byte buffer is stored in image buffer's rect_colorspace property.
- Profile of image buffer was removed since it's not longer meaningful.
- OpenGL and GLSL is supposed to always work in sRGB space. It is possible
to support other spaces, but it's quite large project which isn't so
much important.
- Legacy Color Management option disabled is emulated by using None display.
It could have some regressions, but there's no clear way to avoid them.
- If OpenColorIO is disabled on build time, it should make blender behaving
in the same way as previous release with color management enabled.
More details could be found at this page (more details would be added soon):
http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Color_Management
--
Thanks to Xavier Thomas, Lukas Toene for initial work on OpenColorIO
integration and to Brecht van Lommel for some further development and code/
usecase review!
2012-09-15 10:05:07 +00:00
|
|
|
bf_intern_opencolorio
|
2012-12-30 18:20:52 +00:00
|
|
|
extern_rangetree
|
2013-03-12 07:25:53 +00:00
|
|
|
extern_wcwidth
|
2009-09-06 01:51:23 +00:00
|
|
|
)
|
|
|
|
|
|
2012-06-30 14:14:22 +00:00
|
|
|
if(WITH_COMPOSITOR)
|
2012-07-16 08:42:55 +00:00
|
|
|
# added for opencl compositor
|
|
|
|
|
list_insert_before(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_compositor")
|
2013-02-01 06:24:49 +00:00
|
|
|
list_insert_after(BLENDER_SORTED_LIBS "bf_compositor" "bf_intern_opencl")
|
2012-06-30 14:14:22 +00:00
|
|
|
endif()
|
|
|
|
|
|
2011-11-07 12:55:18 +00:00
|
|
|
if(WITH_LIBMV)
|
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_libmv)
|
2012-06-10 15:27:41 +00:00
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_ceres)
|
2011-11-07 12:55:18 +00:00
|
|
|
endif()
|
|
|
|
|
|
2011-05-09 14:41:44 +00:00
|
|
|
if(WITH_MOD_CLOTH_ELTOPO)
|
2011-05-01 21:39:13 +00:00
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
|
2011-05-09 14:41:44 +00:00
|
|
|
endif()
|
2011-05-01 21:39:13 +00:00
|
|
|
|
2012-06-23 13:42:14 +00:00
|
|
|
if(NOT WITH_SYSTEM_GLEW)
|
2011-04-05 23:31:01 +00:00
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_glew)
|
2011-05-09 14:41:44 +00:00
|
|
|
endif()
|
2011-04-05 23:31:01 +00:00
|
|
|
|
2011-02-21 13:13:08 +00:00
|
|
|
if(WITH_BINRELOC)
|
2010-12-08 08:43:06 +00:00
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_binreloc)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
if(WITH_CXX_GUARDEDALLOC)
|
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS bf_intern_guardedalloc_cpp)
|
|
|
|
|
endif()
|
|
|
|
|
|
2012-08-18 13:36:29 +00:00
|
|
|
if(WITH_IK_SOLVER)
|
|
|
|
|
list_insert_after(BLENDER_SORTED_LIBS "bf_intern_elbeem" "bf_intern_iksolver")
|
|
|
|
|
endif()
|
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
if(WITH_IK_ITASC)
|
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS bf_intern_itasc)
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
if(WITH_CODEC_QUICKTIME)
|
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS bf_quicktime)
|
|
|
|
|
endif()
|
|
|
|
|
|
2012-08-02 16:42:30 +00:00
|
|
|
if(WITH_MOD_BOOLEAN)
|
2012-01-16 16:46:00 +00:00
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_carve)
|
|
|
|
|
endif()
|
|
|
|
|
|
2012-02-17 20:59:21 +00:00
|
|
|
if(WITH_GHOST_XDND)
|
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS extern_xdnd)
|
|
|
|
|
endif()
|
|
|
|
|
|
2012-09-03 11:38:18 +00:00
|
|
|
if(WITH_CYCLES_OSL)
|
|
|
|
|
list_insert_after(BLENDER_SORTED_LIBS "cycles_kernel" "cycles_kernel_osl")
|
|
|
|
|
endif()
|
|
|
|
|
|
2012-11-11 16:54:26 +00:00
|
|
|
if(WITH_INTERNATIONAL)
|
|
|
|
|
list(APPEND BLENDER_SORTED_LIBS bf_intern_locale)
|
|
|
|
|
endif()
|
|
|
|
|
|
2013-01-23 07:26:39 +00:00
|
|
|
if(WITH_BULLET)
|
2013-02-01 06:24:49 +00:00
|
|
|
list_insert_after(BLENDER_SORTED_LIBS "bf_blenkernel" "bf_intern_rigidbody")
|
2013-01-23 07:26:39 +00:00
|
|
|
endif()
|
|
|
|
|
|
2013-03-28 00:58:50 +00:00
|
|
|
if(WITH_BULLET AND NOT WITH_SYSTEM_BULLET)
|
2013-01-03 00:23:52 +00:00
|
|
|
list_insert_after(BLENDER_SORTED_LIBS "ge_logic_ngnetwork" "extern_bullet")
|
|
|
|
|
endif()
|
|
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
foreach(SORTLIB ${BLENDER_SORTED_LIBS})
|
|
|
|
|
set(REMLIB ${SORTLIB})
|
|
|
|
|
foreach(SEARCHLIB ${BLENDER_LINK_LIBS})
|
|
|
|
|
if(${SEARCHLIB} STREQUAL ${SORTLIB})
|
|
|
|
|
set(REMLIB "")
|
|
|
|
|
endif()
|
|
|
|
|
endforeach()
|
|
|
|
|
if(REMLIB)
|
2010-12-16 12:48:30 +00:00
|
|
|
# message(STATUS "Removing library ${REMLIB} from blender linking because: not configured")
|
|
|
|
|
list(APPEND REM_MSG ${REMLIB})
|
2010-12-08 08:43:06 +00:00
|
|
|
list(REMOVE_ITEM BLENDER_SORTED_LIBS ${REMLIB})
|
|
|
|
|
endif()
|
|
|
|
|
endforeach()
|
2010-12-17 04:41:48 +00:00
|
|
|
if(REM_MSG)
|
|
|
|
|
list(SORT REM_MSG)
|
|
|
|
|
message(STATUS "Blender Skipping: (${REM_MSG})")
|
|
|
|
|
endif()
|
2010-12-08 08:43:06 +00:00
|
|
|
target_link_libraries(blender ${BLENDER_SORTED_LIBS})
|
2011-09-30 15:51:58 +00:00
|
|
|
|
2011-06-11 06:00:28 +00:00
|
|
|
unset(SEARCHLIB)
|
|
|
|
|
unset(SORTLIB)
|
|
|
|
|
unset(REMLIB)
|
|
|
|
|
unset(REM_MSG)
|
2011-09-30 15:51:58 +00:00
|
|
|
|
2010-12-08 08:43:06 +00:00
|
|
|
#else()
|
|
|
|
|
# target_link_libraries(blender ${BLENDER_LINK_LIBS})
|
|
|
|
|
#endif()
|
|
|
|
|
|
|
|
|
|
setup_liblinks(blender)
|
