Revision: 30258
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30258
Author: campbellbarton
Date: 2010-07-13 11:41:29 +0200 (Tue, 13 Jul 2010)
Log Message:
-----------
Render Branch: svn merge
https://svn.blender.org/svnroot/bf-blender/trunk/blender -r30231:30257
Modified Paths:
--------------
branches/render25/CMakeLists.txt
branches/render25/Makefile
branches/render25/SConstruct
branches/render25/release/scripts/op/presets.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/source/blender/blenkernel/intern/particle.c
branches/render25/source/blender/blenkernel/intern/sequencer.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/makesdna/DNA_sequence_types.h
branches/render25/source/blender/makesrna/intern/rna_sequencer.c
branches/render25/source/blender/makesrna/rna_cleanup/rna_booleans.txt
branches/render25/source/blender/makesrna/rna_cleanup/rna_cleaner.py
Added Paths:
-----------
branches/render25/build_files/
branches/render25/build_files/cmake/
branches/render25/build_files/cmake/macros.cmake
branches/render25/build_files/make/
branches/render25/build_files/make/example_scripts/
branches/render25/build_files/make/example_scripts/linux_nanmakefiles.sh
branches/render25/build_files/make/example_scripts/macos_nanmakefiles.sh
branches/render25/build_files/make/example_scripts/sunos_nanmakefiles.sh
branches/render25/build_files/make/nan_compile.mk
branches/render25/build_files/make/nan_definitions.mk
branches/render25/build_files/make/nan_link.mk
branches/render25/build_files/make/nan_subdirs.mk
branches/render25/build_files/make/nan_warn.mk
branches/render25/build_files/scons/
branches/render25/build_files/scons/config/
branches/render25/build_files/scons/config/aix4-config.py
branches/render25/build_files/scons/config/darwin-config.py
branches/render25/build_files/scons/config/irix6-config.py
branches/render25/build_files/scons/config/linux2-config.py
branches/render25/build_files/scons/config/linuxcross-config.py
branches/render25/build_files/scons/config/openbsd3-config.py
branches/render25/build_files/scons/config/sunos5-config.py
branches/render25/build_files/scons/config/win32-mingw-config.py
branches/render25/build_files/scons/config/win32-vc-config.py
branches/render25/build_files/scons/config/win64-vc-config.py
branches/render25/build_files/scons/tools/
branches/render25/build_files/scons/tools/Blender.py
branches/render25/build_files/scons/tools/__init__.py
branches/render25/build_files/scons/tools/bcolors.py
branches/render25/build_files/scons/tools/btools.py
branches/render25/build_files/scons/tools/crossmingw.py
branches/render25/build_files/scons/tools/mstoolkit.py
Removed Paths:
-------------
branches/render25/CMake/
branches/render25/build_files/cmake/
branches/render25/build_files/cmake/macros.cmake
branches/render25/build_files/make/
branches/render25/build_files/make/example_scripts/
branches/render25/build_files/make/example_scripts/linux_nanmakefiles.sh
branches/render25/build_files/make/example_scripts/macos_nanmakefiles.sh
branches/render25/build_files/make/example_scripts/sunos_nanmakefiles.sh
branches/render25/build_files/make/nan_compile.mk
branches/render25/build_files/make/nan_definitions.mk
branches/render25/build_files/make/nan_link.mk
branches/render25/build_files/make/nan_subdirs.mk
branches/render25/build_files/make/nan_warn.mk
branches/render25/build_files/scons/
branches/render25/build_files/scons/config/
branches/render25/build_files/scons/config/aix4-config.py
branches/render25/build_files/scons/config/darwin-config.py
branches/render25/build_files/scons/config/irix6-config.py
branches/render25/build_files/scons/config/linux2-config.py
branches/render25/build_files/scons/config/linuxcross-config.py
branches/render25/build_files/scons/config/openbsd3-config.py
branches/render25/build_files/scons/config/sunos5-config.py
branches/render25/build_files/scons/config/win32-mingw-config.py
branches/render25/build_files/scons/config/win32-vc-config.py
branches/render25/build_files/scons/config/win64-vc-config.py
branches/render25/build_files/scons/tools/
branches/render25/build_files/scons/tools/Blender.py
branches/render25/build_files/scons/tools/__init__.py
branches/render25/build_files/scons/tools/bcolors.py
branches/render25/build_files/scons/tools/btools.py
branches/render25/build_files/scons/tools/crossmingw.py
branches/render25/build_files/scons/tools/mstoolkit.py
branches/render25/config/
branches/render25/make/
branches/render25/source/nan_compile.mk
branches/render25/source/nan_definitions.mk
branches/render25/source/nan_link.mk
branches/render25/source/nan_subdirs.mk
branches/render25/source/nan_warn.mk
branches/render25/tools/
Modified: branches/render25/CMakeLists.txt
===================================================================
--- branches/render25/CMakeLists.txt 2010-07-13 09:31:28 UTC (rev 30257)
+++ branches/render25/CMakeLists.txt 2010-07-13 09:41:29 UTC (rev 30258)
@@ -61,7 +61,7 @@
#-----------------------------------------------------------------------------
# Load some macros.
-INCLUDE(CMake/macros.cmake)
+INCLUDE(build_files/cmake/macros.cmake)
#-----------------------------------------------------------------------------
# Set default config options
Modified: branches/render25/Makefile
===================================================================
--- branches/render25/Makefile 2010-07-13 09:31:28 UTC (rev 30257)
+++ branches/render25/Makefile 2010-07-13 09:41:29 UTC (rev 30258)
@@ -41,7 +41,7 @@
# export NAN_NO_OPENAL=true
export NANBLENDERHOME=$(shell pwd)
-MAKEFLAGS=-I$(NANBLENDERHOME)/source --no-print-directory
+MAKEFLAGS=-I$(NANBLENDERHOME)/build_files/make --no-print-directory
SOURCEDIR =
ifeq ($(FREE_WINDOWS),true)
@@ -50,7 +50,7 @@
DIRS ?= extern intern source po
endif
-include source/nan_subdirs.mk
+include build_files/make/nan_subdirs.mk
.PHONY: release
release:
Modified: branches/render25/SConstruct
===================================================================
--- branches/render25/SConstruct 2010-07-13 09:31:28 UTC (rev 30257)
+++ branches/render25/SConstruct 2010-07-13 09:41:29 UTC (rev 30258)
@@ -46,6 +46,9 @@
import re
from tempfile import mkdtemp
+# needed for importing tools
+sys.path.append(os.path.join(".", "build_files", "scons"))
+
import tools.Blender
import tools.btools
import tools.bcolors
@@ -159,7 +162,7 @@
env['OURPLATFORM'] = platform
-configfile = 'config'+os.sep+platform+'-config.py'
+configfile = os.path.join("build_files", "scons", "config", platform +
"-config.py")
if os.path.exists(configfile):
print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
Copied: branches/render25/build_files (from rev 30257,
trunk/blender/build_files)
Copied: branches/render25/build_files/cmake (from rev 30257,
trunk/blender/build_files/cmake)
Deleted: branches/render25/build_files/cmake/macros.cmake
===================================================================
--- trunk/blender/build_files/cmake/macros.cmake 2010-07-13 09:31:28 UTC
(rev 30257)
+++ branches/render25/build_files/cmake/macros.cmake 2010-07-13 09:41:29 UTC
(rev 30258)
@@ -1,200 +0,0 @@
-MACRO(BLENDERLIB_NOLIST
- name
- sources
- includes)
-
- # Gather all headers
- FILE(GLOB_RECURSE INC_ALL *.h)
-
- INCLUDE_DIRECTORIES(${includes})
- ADD_LIBRARY(${name} ${INC_ALL} ${sources})
-
- # Group by location on disk
- SOURCE_GROUP(Files FILES CMakeLists.txt)
- SET(ALL_FILES ${sources} ${INC_ALL})
- FOREACH(SRC ${ALL_FILES})
- STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files"
REL_DIR "${SRC}")
- STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR
"${REL_DIR}")
- STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
- IF(REL_DIR)
- SOURCE_GROUP(${REL_DIR} FILES ${SRC})
- ELSE(REL_DIR)
- SOURCE_GROUP(Files FILES ${SRC})
- ENDIF(REL_DIR)
- ENDFOREACH(SRC)
-
- MESSAGE(STATUS "Configuring library ${name}")
-ENDMACRO(BLENDERLIB_NOLIST)
-
-MACRO(BLENDERLIB
- name
- sources
- includes)
-
- BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
-
- # Add to blender's list of libraries
- FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
-ENDMACRO(BLENDERLIB)
-
-MACRO(SETUP_LIBDIRS)
- # see "cmake --help-policy CMP0003"
- if(COMMAND cmake_policy)
- CMAKE_POLICY(SET CMP0003 NEW)
- endif(COMMAND cmake_policy)
-
- LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH}
${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
-
- IF(WITH_PYTHON)
- LINK_DIRECTORIES(${PYTHON_LIBPATH})
- ENDIF(WITH_PYTHON)
- IF(WITH_INTERNATIONAL)
- LINK_DIRECTORIES(${ICONV_LIBPATH})
- LINK_DIRECTORIES(${GETTEXT_LIBPATH})
- ENDIF(WITH_INTERNATIONAL)
- IF(WITH_SDL)
- LINK_DIRECTORIES(${SDL_LIBPATH})
- ENDIF(WITH_SDL)
- IF(WITH_FFMPEG)
- LINK_DIRECTORIES(${FFMPEG_LIBPATH})
- ENDIF(WITH_FFMPEG)
- IF(WITH_OPENEXR)
- LINK_DIRECTORIES(${OPENEXR_LIBPATH})
- ENDIF(WITH_OPENEXR)
- IF(WITH_TIFF)
- LINK_DIRECTORIES(${TIFF_LIBPATH})
- ENDIF(WITH_TIFF)
- IF(WITH_LCMS)
- LINK_DIRECTORIES(${LCMS_LIBPATH})
- ENDIF(WITH_LCMS)
- IF(WITH_QUICKTIME)
- LINK_DIRECTORIES(${QUICKTIME_LIBPATH})
- ENDIF(WITH_QUICKTIME)
- IF(WITH_OPENAL)
- LINK_DIRECTORIES(${OPENAL_LIBPATH})
- ENDIF(WITH_OPENAL)
- IF(WITH_JACK)
- LINK_DIRECTORIES(${JACK_LIBPATH})
- ENDIF(WITH_JACK)
- IF(WITH_SNDFILE)
- LINK_DIRECTORIES(${SNDFILE_LIBPATH})
- ENDIF(WITH_SNDFILE)
- IF(WITH_FFTW3)
- LINK_DIRECTORIES(${FFTW3_LIBPATH})
- ENDIF(WITH_FFTW3)
- IF(WITH_OPENCOLLADA)
- LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
- LINK_DIRECTORIES(${PCRE_LIBPATH})
- LINK_DIRECTORIES(${EXPAT_LIBPATH})
- ENDIF(WITH_OPENCOLLADA)
-
- IF(WIN32)
- LINK_DIRECTORIES(${PTHREADS_LIBPATH})
- ENDIF(WIN32)
-ENDMACRO(SETUP_LIBDIRS)
-
-MACRO(SETUP_LIBLINKS
- target)
- SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}
${PLATFORM_LINKFLAGS} ")
-
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY}
${OPENGL_glu_LIBRARY} ${JPEG_LIBRARY} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES}
${LLIBS})
-
- # since we are using the local libs for python when compiling msvc
projects, we need to add _d when compiling debug versions
- IF(WITH_PYTHON)
- TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS})
-
- IF(WIN32)
- TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d)
- TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB})
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_PYTHON)
-
- TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB}
${PNG_LIB} ${ZLIB_LIB})
- TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIBRARY}
${LIBSAMPLERATE_LIB})
-
- IF(WITH_INTERNATIONAL)
- TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
-
- IF(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_INTERNATIONAL)
-
- IF(WITH_OPENAL)
- TARGET_LINK_LIBRARIES(${target} ${OPENAL_LIBRARY})
- ENDIF(WITH_OPENAL)
- IF(WITH_FFTW3)
- TARGET_LINK_LIBRARIES(${target} ${FFTW3_LIB})
- ENDIF(WITH_FFTW3)
- IF(WITH_JACK)
- TARGET_LINK_LIBRARIES(${target} ${JACK_LIB})
- ENDIF(WITH_JACK)
- IF(WITH_SNDFILE)
- TARGET_LINK_LIBRARIES(${target} ${SNDFILE_LIB})
- ENDIF(WITH_SNDFILE)
- IF(WITH_SDL)
- TARGET_LINK_LIBRARIES(${target} ${SDL_LIBRARY})
- ENDIF(WITH_SDL)
- IF(WITH_QUICKTIME)
- TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB})
- ENDIF(WITH_QUICKTIME)
- IF(WITH_TIFF)
- TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY})
- ENDIF(WITH_TIFF)
- IF(WITH_OPENEXR)
- IF(WIN32)
- FOREACH(loop_var ${OPENEXR_LIB})
- TARGET_LINK_LIBRARIES(${target} debug
${loop_var}_d)
- TARGET_LINK_LIBRARIES(${target} optimized
${loop_var})
- ENDFOREACH(loop_var)
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_OPENEXR)
- IF(WITH_LCMS)
- TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY})
- ENDIF(WITH_LCMS)
- IF(WITH_FFMPEG)
- TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
- ENDIF(WITH_FFMPEG)
- IF(WITH_OPENCOLLADA)
- IF(WIN32)
- FOREACH(loop_var ${OPENCOLLADA_LIB})
- TARGET_LINK_LIBRARIES(${target} debug
${loop_var}_d)
- TARGET_LINK_LIBRARIES(${target} optimized
${loop_var})
- ENDFOREACH(loop_var)
- TARGET_LINK_LIBRARIES(${target} debug ${PCRE_LIB}_d)
- TARGET_LINK_LIBRARIES(${target} optimized ${PCRE_LIB})
- IF(EXPAT_LIB)
- TARGET_LINK_LIBRARIES(${target} debug
${EXPAT_LIB}_d)
- TARGET_LINK_LIBRARIES(${target} optimized
${EXPAT_LIB})
- ENDIF(EXPAT_LIB)
- ELSE(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
- TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
- TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
- ENDIF(WIN32)
- ENDIF(WITH_OPENCOLLADA)
- IF(WIN32)
- TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
- ENDIF(WIN32)
-ENDMACRO(SETUP_LIBLINKS)
-
-MACRO(TEST_SSE_SUPPORT)
- INCLUDE(CheckCXXSourceCompiles)
-
- MESSAGE(STATUS "Detecting SSE support")
- IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
- SET(CMAKE_REQUIRED_FLAGS "-msse -msse2")
- ELSEIF(MSVC)
- SET(CMAKE_REQUIRED_FLAGS "/arch:SSE2")
- ENDIF()
-
- CHECK_CXX_SOURCE_COMPILES("
- #include <xmmintrin.h>
- int main() { __m128 v = _mm_setzero_ps(); return 0; }"
- SUPPORT_SSE_BUILD)
-ENDMACRO(TEST_SSE_SUPPORT)
-
Copied: branches/render25/build_files/cmake/macros.cmake (from rev 30257,
trunk/blender/build_files/cmake/macros.cmake)
===================================================================
--- branches/render25/build_files/cmake/macros.cmake
(rev 0)
+++ branches/render25/build_files/cmake/macros.cmake 2010-07-13 09:41:29 UTC
(rev 30258)
@@ -0,0 +1,200 @@
+MACRO(BLENDERLIB_NOLIST
+ name
+ sources
+ includes)
+
+ # Gather all headers
+ FILE(GLOB_RECURSE INC_ALL *.h)
+
+ INCLUDE_DIRECTORIES(${includes})
+ ADD_LIBRARY(${name} ${INC_ALL} ${sources})
+
+ # Group by location on disk
+ SOURCE_GROUP(Files FILES CMakeLists.txt)
+ SET(ALL_FILES ${sources} ${INC_ALL})
+ FOREACH(SRC ${ALL_FILES})
+ STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files"
REL_DIR "${SRC}")
+ STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR
"${REL_DIR}")
+ STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
+ IF(REL_DIR)
+ SOURCE_GROUP(${REL_DIR} FILES ${SRC})
+ ELSE(REL_DIR)
+ SOURCE_GROUP(Files FILES ${SRC})
+ ENDIF(REL_DIR)
+ ENDFOREACH(SRC)
+
+ MESSAGE(STATUS "Configuring library ${name}")
+ENDMACRO(BLENDERLIB_NOLIST)
+
+MACRO(BLENDERLIB
+ name
+ sources
+ includes)
+
+ BLENDERLIB_NOLIST(${name} "${sources}" "${includes}")
+
+ # Add to blender's list of libraries
+ FILE(APPEND ${CMAKE_BINARY_DIR}/cmake_blender_libs.txt "${name};")
+ENDMACRO(BLENDERLIB)
+
+MACRO(SETUP_LIBDIRS)
+ # see "cmake --help-policy CMP0003"
+ if(COMMAND cmake_policy)
+ CMAKE_POLICY(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)
+
+ LINK_DIRECTORIES(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH}
${FREETYPE_LIBPATH} ${LIBSAMPLERATE_LIBPATH})
+
+ IF(WITH_PYTHON)
+ LINK_DIRECTORIES(${PYTHON_LIBPATH})
+ ENDIF(WITH_PYTHON)
+ IF(WITH_INTERNATIONAL)
+ LINK_DIRECTORIES(${ICONV_LIBPATH})
+ LINK_DIRECTORIES(${GETTEXT_LIBPATH})
+ ENDIF(WITH_INTERNATIONAL)
+ IF(WITH_SDL)
+ LINK_DIRECTORIES(${SDL_LIBPATH})
+ ENDIF(WITH_SDL)
+ IF(WITH_FFMPEG)
+ LINK_DIRECTORIES(${FFMPEG_LIBPATH})
+ ENDIF(WITH_FFMPEG)
+ IF(WITH_OPENEXR)
+ LINK_DIRECTORIES(${OPENEXR_LIBPATH})
+ ENDIF(WITH_OPENEXR)
+ IF(WITH_TIFF)
+ LINK_DIRECTORIES(${TIFF_LIBPATH})
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
