[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38044] branches/soc-2011-carrot: Merge with trunk r38042
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Sat Jul 2 20:15:55 CEST 2011
Revision: 38044
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38044
Author: miikah
Date: 2011-07-02 18:15:55 +0000 (Sat, 02 Jul 2011)
Log Message:
-----------
Merge with trunk r38042
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38042
Modified Paths:
--------------
branches/soc-2011-carrot/CMakeLists.txt
branches/soc-2011-carrot/GNUmakefile
branches/soc-2011-carrot/build_files/cmake/cmake_consistency_check.py
branches/soc-2011-carrot/build_files/cmake/macros.cmake
branches/soc-2011-carrot/build_files/scons/config/win32-vc-config.py
branches/soc-2011-carrot/build_files/scons/config/win64-vc-config.py
branches/soc-2011-carrot/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-carrot/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowNULL.h
branches/soc-2011-carrot/release/scripts/modules/bpy/__init__.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-carrot/release/scripts/modules/console/intellisense.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/image.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-carrot/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-carrot/source/blender/blenkernel/intern/key.c
branches/soc-2011-carrot/source/blender/collada/EffectExporter.cpp
branches/soc-2011-carrot/source/blender/editors/armature/armature_intern.h
branches/soc-2011-carrot/source/blender/editors/armature/armature_ops.c
branches/soc-2011-carrot/source/blender/editors/armature/editarmature.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_draw.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-carrot/source/blender/editors/object/object_edit.c
branches/soc-2011-carrot/source/blender/editors/object/object_hook.c
branches/soc-2011-carrot/source/blender/editors/object/object_relations.c
branches/soc-2011-carrot/source/blender/editors/render/render_internal.c
branches/soc-2011-carrot/source/blender/editors/screen/area.c
branches/soc-2011-carrot/source/blender/editors/screen/screen_edit.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2011-carrot/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2011-carrot/source/blender/makesdna/DNA_space_types.h
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_render.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_space.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-carrot/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2011-carrot/source/blender/render/intern/include/render_types.h
branches/soc-2011-carrot/source/blender/render/intern/source/convertblender.c
branches/soc-2011-carrot/source/blender/render/intern/source/imagetexture.c
branches/soc-2011-carrot/source/blender/render/intern/source/pipeline.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-carrot/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-carrot/source/creator/CMakeLists.txt
branches/soc-2011-carrot/source/creator/creator.c
branches/soc-2011-carrot/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2011-carrot/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2011-carrot/source/tests/CMakeLists.txt
Added Paths:
-----------
branches/soc-2011-carrot/doc/python_api/rst/bgl.rst
Removed Paths:
-------------
branches/soc-2011-carrot/doc/python_api/epy/BGL.py
Property Changed:
----------------
branches/soc-2011-carrot/
Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36828-37849
+ /trunk/blender:36828-38042
Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt 2011-07-02 18:06:39 UTC (rev 38043)
+++ branches/soc-2011-carrot/CMakeLists.txt 2011-07-02 18:15:55 UTC (rev 38044)
@@ -53,10 +53,12 @@
set(FIRST_RUN "TRUE")
endif()
-
# this starts out unset
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/build_files/cmake/Modules")
+# avoid having empty buildtype
+set(CMAKE_BUILD_TYPE_INIT "Release")
+
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
@@ -142,7 +144,7 @@
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
# Audio/Video format support
-option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu)" OFF)
+option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
option(WITH_CODEC_SNDFILE "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
if(APPLE OR (WIN32 AND NOT UNIX))
option(WITH_CODEC_QUICKTIME "Enable Quicktime Support" OFF)
@@ -240,13 +242,26 @@
set(WITH_BINRELOC OFF)
# MAXOSX only, set to avoid uninitialized
-set(EXETYPE "")
+set(EXETYPE)
+# C/C++ flags
+set(PLATFORM_CFLAGS)
+
# these are added to later on.
-set(C_WARNINGS "")
-set(CXX_WARNINGS "")
+set(C_WARNINGS)
+set(CXX_WARNINGS)
+# libraries to link the binary with passed to target_link_libraries()
+# known as LLIBS to scons
+set(PLATFORM_LINKLIBS)
+# Added to linker flags in setup_liblinks
+# - CMAKE_EXE_LINKER_FLAGS
+# - CMAKE_EXE_LINKER_FLAGS_DEBUG
+set(PLATFORM_LINKFLAGS)
+set(PLATFORM_LINKFLAGS_DEBUG)
+
+
# disabled for now, not supported
# option(WITH_WEBPLUGIN "Enable Web Plugin (Unix only)" OFF)
@@ -347,7 +362,7 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
+ set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
mark_as_advanced(FFMPEG)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
@@ -391,18 +406,18 @@
endif()
if(WITH_OPENCOLLADA)
- set(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
+ set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada Directory")
mark_as_advanced(OPENCOLLADA)
set(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
set(OPENCOLLADA_LIBRARIES OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser UTF MathMLSolver pcre ftoa buffer xml2)
set(OPENCOLLADA_INCLUDE_DIR ${OPENCOLLADA})
- set(PCRE /usr CACHE FILEPATH "PCRE Directory")
+ set(PCRE /usr CACHE PATH "PCRE Directory")
mark_as_advanced(PCRE)
set(PCRE_LIBPATH ${PCRE}/lib)
set(PCRE_LIB pcre)
- set(EXPAT /usr CACHE FILEPATH "Expat Directory")
+ set(EXPAT /usr CACHE PATH "Expat Directory")
mark_as_advanced(EXPAT)
set(EXPAT_LIBPATH ${EXPAT}/lib)
set(EXPAT_LIB expat)
@@ -416,24 +431,24 @@
endif()
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
- set(LLIBS "-lutil -lc -lm -lpthread -lstdc++")
+ set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
if(NOT WITH_HEADLESS)
find_package(X11 REQUIRED)
find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
- list(APPEND LLIBS ${X11_X11_LIB})
+ list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB})
if(WITH_X11_XINPUT)
- list(APPEND LLIBS ${X11_Xinput_LIB})
+ list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
endif()
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(NOT WITH_PYTHON_MODULE)
# BSD's dont use libdl.so
- list(APPEND LLIBS -ldl)
+ list(APPEND PLATFORM_LINKLIBS -ldl)
# binreloc is linux only
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
@@ -544,14 +559,16 @@
if(MSVC)
if(CMAKE_CL_64)
- set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
+ set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
else()
- set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
+ set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
endif()
-
- set(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB /nologo /Ob1 /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
- set(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB /nologo /Ob1 /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+ add_definitions(/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /D_CONSOLE /D_LIB)
+
+ set(CMAKE_CXX_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013" CACHE STRING "MSVC MT C++ flags " FORCE)
+ set(CMAKE_C_FLAGS "/nologo /J /W0 /Gd /wd4018 /wd4244 /wd4305 /wd4800 /wd4065 /wd4267 /we4013 /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE)
+
if(CMAKE_CL_64)
set(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
else()
@@ -587,24 +604,22 @@
endif()
set(JPEG_LIBRARIES libjpeg)
- set(ZLIB ${LIBDIR}/zlib)
- set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
- set(ZLIB_LIBPATH ${ZLIB}/lib)
+ set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
if(CMAKE_CL_64)
- set(ZLIB_LIBRARIES libz)
+ set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz.lib)
else()
- set(ZLIB_LIBRARIES zlib)
+ set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/zlib.lib)
endif()
- set(PTHREADS ${LIBDIR}/pthreads)
- set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
- set(PTHREADS_LIBPATH ${PTHREADS}/lib)
- set(PTHREADS_LIBRARIES pthreadVC2)
-
+ set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
+ set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
+
set(FREETYPE ${LIBDIR}/freetype)
- set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
- set(FREETYPE_LIBPATH ${FREETYPE}/lib)
- set(FREETYPE_LIBRARY freetype2ST)
+ set(FREETYPE_INCLUDE_DIRS
+ ${LIBDIR}/freetype/include
+ ${LIBDIR}/freetype/include/freetype2
+ )
+ set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
@@ -635,10 +650,17 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG ${LIBDIR}/ffmpeg)
- set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/msvc)
- set(FFMPEG_LIBRARIES avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
- set(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ set(FFMPEG_INCLUDE_DIRS
+ ${LIBDIR}/ffmpeg/include
+ ${LIBDIR}/ffmpeg/include/msvc
+ )
+ set(FFMPEG_LIBRARIES
+ ${LIBDIR}/ffmpeg/lib/avcodec-52.lib
+ ${LIBDIR}/ffmpeg/lib/avformat-52.lib
+ ${LIBDIR}/ffmpeg/lib/avdevice-52.lib
+ ${LIBDIR}/ffmpeg/lib/avutil-50.lib
+ ${LIBDIR}/ffmpeg/lib/swscale-0.lib
+ )
endif()
if(WITH_IMAGE_OPENEXR)
@@ -673,17 +695,16 @@
endif()
if(WITH_IMAGE_TIFF)
- set(TIFF ${LIBDIR}/tiff)
- set(TIFF_LIBRARY libtiff)
- set(TIFF_INCLUDE_DIR ${TIFF}/include)
- set(TIFF_LIBPATH ${TIFF}/lib)
+ set(TIFF_LIBRARY ${LIBDIR}/tiff/lib/libtiff.lib)
+ set(TIFF_INCLUDE_DIR ${LIBDIR}/tiff/include)
endif()
if(WITH_JACK)
- set(JACK ${LIBDIR}/jack)
- set(JACK_INCLUDE_DIRS ${JACK}/include/jack ${JACK}/include)
- set(JACK_LIBRARIES libjack)
- set(JACK_LIBPATH ${JACK}/lib)
+ set(JACK_INCLUDE_DIRS
+ ${LIBDIR}/jack/include/jack
+ ${LIBDIR}/jack/include
+ )
+ set(JACK_LIBRARIES ${LIBDIR}/jack/lib/libjack.lib)
endif()
if(WITH_PYTHON)
@@ -693,23 +714,24 @@
set(PYTHON_LIBRARIES ${LIBDIR}/python/lib/python32.lib)
endif()
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /STACK:2097152 /INCREMENTAL:NO /NODEFAULTLIB:msvcrt.lib /NODEFAULTLIB:msvcmrt.lib /NODEFAULTLIB:msvcurt.lib /NODEFAULTLIB:msvcrtd.lib")
+
# MSVC only, Mingw doesnt need
if(CMAKE_CL_64)
- set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /MACHINE:X64 /STACK:2097152 /OPT:NOREF /INCREMENTAL:NO /NODEFAULTLIB:\"msvcrt.lib\" /NODEFAULTLIB:\"msvcmrt.lib\" /NODEFAULTLIB:\"msvcurt.lib\" /NODEFAULTLIB:\"msvcrtd.lib\" ")
+ set(PLATFORM_LINKFLAGS "/MACHINE:X64 /OPT:NOREF ${PLATFORM_LINKFLAGS}")
else()
- set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE /MACHINE:IX86 /STACK:2097152 /INCREMENTAL:NO /LARGEADDRESSAWARE /NODEFAULTLIB:\"msvcrt.lib\" /NODEFAULTLIB:\"msvcmrt.lib\" /NODEFAULTLIB:\"msvcurt.lib\" /NODEFAULTLIB:\"msvcrtd.lib\" ")
+ set(PLATFORM_LINKFLAGS "/MACHINE:IX86 /LARGEADDRESSAWARE ${PLATFORM_LINKFLAGS}")
endif()
- set(CMAKE_EXE_LINKER_FLAGS_DEBUG "${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
+ set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib /NODEFAULTLIB:libc.lib")
else()
# keep GCC spesific stuff here
if(CMAKE_COMPILER_IS_GNUCC)
- set(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+ set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE")
+ add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
endif()
add_definitions(-DFREE_WINDOWS)
@@ -919,7 +941,7 @@
set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
- set(LLIBS stdc++ SystemStubs)
+ set(PLATFORM_LINKLIBS stdc++ SystemStubs)
if(WITH_COCOA)
set(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
@@ -1143,6 +1165,18 @@
endif()
+# MSVC2010 fails to links C++ libs right
+if(MSVC10)
+ if(WITH_IMAGE_OPENEXR)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list