Revision: 38474
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38474
Author: campbellbarton
Date: 2011-07-18 14:15:02 +0000 (Mon, 18 Jul 2011)
Log Message:
-----------
svn merge -r37793:37865 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Merge info was /trunk/blender:36835-37793,37865-38157
so this should merge in missing files.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37793
Modified Paths:
--------------
branches/soc-2011-radish/CMakeLists.txt
branches/soc-2011-radish/GNUmakefile
branches/soc-2011-radish/build_files/cmake/macros.cmake
branches/soc-2011-radish/build_files/scons/config/aix4-config.py
branches/soc-2011-radish/build_files/scons/config/win32-vc-config.py
branches/soc-2011-radish/build_files/scons/config/win64-vc-config.py
branches/soc-2011-radish/doc/python_api/rst/change_log.rst
branches/soc-2011-radish/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-radish/intern/ghost/intern/GHOST_DisplayManagerCocoa.mm
branches/soc-2011-radish/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2011-radish/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-radish/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2011-radish/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-radish/intern/iksolver/intern/IK_QSegment.cpp
branches/soc-2011-radish/intern/itasc/ConstraintSet.cpp
branches/soc-2011-radish/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-radish/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-radish/source/blender/blenkernel/intern/blender.c
branches/soc-2011-radish/source/blender/blenkernel/intern/brush.c
branches/soc-2011-radish/source/blender/blenkernel/intern/paint.c
branches/soc-2011-radish/source/blender/blenkernel/intern/sound.c
branches/soc-2011-radish/source/blender/blenlib/BLI_math_geom.h
branches/soc-2011-radish/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-radish/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-radish/source/blender/blenloader/intern/readfile.c
branches/soc-2011-radish/source/blender/editors/armature/armature_intern.h
branches/soc-2011-radish/source/blender/editors/armature/armature_ops.c
branches/soc-2011-radish/source/blender/editors/armature/editarmature.c
branches/soc-2011-radish/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-radish/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-radish/source/blender/editors/object/object_bake.c
branches/soc-2011-radish/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-radish/source/blender/editors/space_info/info_stats.c
branches/soc-2011-radish/source/blender/editors/transform/transform_constraints.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_ID.c
branches/soc-2011-radish/source/blender/makesrna/intern/rna_rna.c
branches/soc-2011-radish/source/blender/nodes/intern/CMP_nodes/CMP_channelMatte.c
branches/soc-2011-radish/source/blender/nodes/intern/CMP_nodes/CMP_glare.c
branches/soc-2011-radish/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/soc-2011-radish/source/blender/python/BPY_extern.h
branches/soc-2011-radish/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-radish/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-radish/source/blender/python/intern/CMakeLists.txt
branches/soc-2011-radish/source/blender/python/intern/bpy_app.c
branches/soc-2011-radish/source/blender/render/intern/source/pipeline.c
branches/soc-2011-radish/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-radish/source/blender/render/intern/source/volumetric.c
branches/soc-2011-radish/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-radish/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-radish/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-radish/source/creator/creator.c
branches/soc-2011-radish/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2011-radish/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2011-radish/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
Added Paths:
-----------
branches/soc-2011-radish/doc/python_api/examples/aud.py
branches/soc-2011-radish/source/blender/blenlib/BLI_callbacks.h
branches/soc-2011-radish/source/blender/blenlib/intern/callbacks.c
branches/soc-2011-radish/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2011-radish/source/blender/python/intern/bpy_app_handlers.h
Removed Paths:
-------------
branches/soc-2011-radish/source/blender/blenlib/intern/BLI_callbacks.h
Property Changed:
----------------
branches/soc-2011-radish/
Property changes on: branches/soc-2011-radish
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36835-37793,37865-38157
+ /trunk/blender:36835-38157
Modified: branches/soc-2011-radish/CMakeLists.txt
===================================================================
--- branches/soc-2011-radish/CMakeLists.txt 2011-07-18 10:44:23 UTC (rev
38473)
+++ branches/soc-2011-radish/CMakeLists.txt 2011-07-18 14:15:02 UTC (rev
38474)
@@ -53,9 +53,13 @@
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)
@@ -141,7 +145,7 @@
option(WITH_IMAGE_REDCODE "Enable RedCode Image Support" OFF)
# Audio/Video format support
-option(WITH_CODEC_FFMPEG "Enable FFMPeg Support (http://ffmpeg.org)"
OFF)
+option(WITH_CODEC_FFMPEG "Enable FFMPeg Support
(http://ffmpeg.mplayerhq.hu)" 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)
@@ -239,26 +243,13 @@
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)
@@ -359,7 +350,7 @@
endif()
if(WITH_CODEC_FFMPEG)
- set(FFMPEG /usr CACHE PATH "FFMPEG Directory")
+ set(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
mark_as_advanced(FFMPEG)
set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include)
set(FFMPEG_LIBRARIES avformat avcodec avutil avdevice swscale
CACHE STRING "FFMPEG Libraries")
@@ -403,18 +394,18 @@
endif()
if(WITH_OPENCOLLADA)
- set(OPENCOLLADA /usr/local/opencollada CACHE PATH "OpenCollada
Directory")
+ set(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH
"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 PATH "PCRE Directory")
+ set(PCRE /usr CACHE FILEPATH "PCRE Directory")
mark_as_advanced(PCRE)
set(PCRE_LIBPATH ${PCRE}/lib)
set(PCRE_LIB pcre)
- set(EXPAT /usr CACHE PATH "Expat Directory")
+ set(EXPAT /usr CACHE FILEPATH "Expat Directory")
mark_as_advanced(EXPAT)
set(EXPAT_LIBPATH ${EXPAT}/lib)
set(EXPAT_LIB expat)
@@ -428,24 +419,24 @@
endif()
# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using
--as-needed
- set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread -lstdc++")
+ set(LLIBS "-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 PLATFORM_LINKLIBS ${X11_X11_LIB})
+ list(APPEND LLIBS ${X11_X11_LIB})
if(WITH_X11_XINPUT)
- list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
+ list(APPEND LLIBS ${X11_Xinput_LIB})
endif()
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(NOT WITH_PYTHON_MODULE)
# BSD's dont use libdl.so
- list(APPEND PLATFORM_LINKLIBS -ldl)
+ list(APPEND LLIBS -ldl)
# binreloc is linux only
set(BINRELOC_INCLUDE_DIRS
${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
@@ -556,16 +547,14 @@
if(MSVC)
if(CMAKE_CL_64)
- set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32
user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
+ set(LLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32
comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
else()
- set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32
user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid)
+ set(LLIBS 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()
@@ -601,22 +590,24 @@
endif()
set(JPEG_LIBRARIES libjpeg)
- set(ZLIB_INCLUDE_DIRS ${LIBDIR}/zlib/include)
+ set(ZLIB ${LIBDIR}/zlib)
+ set(ZLIB_INCLUDE_DIRS ${ZLIB}/include)
+ set(ZLIB_LIBPATH ${ZLIB}/lib)
if(CMAKE_CL_64)
- set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/libz.lib)
+ set(ZLIB_LIBRARIES libz)
else()
- set(ZLIB_LIBRARIES ${LIBDIR}/zlib/lib/zlib.lib)
+ set(ZLIB_LIBRARIES zlib)
endif()
- set(PTHREADS_INCLUDE_DIRS ${LIBDIR}/pthreads/include)
- set(PTHREADS_LIBRARIES ${LIBDIR}/pthreads/lib/pthreadVC2.lib)
-
+ set(PTHREADS ${LIBDIR}/pthreads)
+ set(PTHREADS_INCLUDE_DIRS ${PTHREADS}/include)
+ set(PTHREADS_LIBPATH ${PTHREADS}/lib)
+ set(PTHREADS_LIBRARIES pthreadVC2)
+
set(FREETYPE ${LIBDIR}/freetype)
- set(FREETYPE_INCLUDE_DIRS
- ${LIBDIR}/freetype/include
- ${LIBDIR}/freetype/include/freetype2
- )
- set(FREETYPE_LIBRARY ${LIBDIR}/freetype/lib/freetype2ST.lib)
+ set(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include
${FREETYPE}/include/freetype2)
+ set(FREETYPE_LIBPATH ${FREETYPE}/lib)
+ set(FREETYPE_LIBRARY freetype2ST)
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
@@ -647,17 +638,10 @@
endif()
if(WITH_CODEC_FFMPEG)
- 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
- )
+ 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)
endif()
if(WITH_IMAGE_OPENEXR)
@@ -692,16 +676,17 @@
endif()
if(WITH_IMAGE_TIFF)
- set(TIFF_LIBRARY ${LIBDIR}/tiff/lib/libtiff.lib)
- set(TIFF_INCLUDE_DIR ${LIBDIR}/tiff/include)
+ set(TIFF ${LIBDIR}/tiff)
+ set(TIFF_LIBRARY libtiff)
+ set(TIFF_INCLUDE_DIR ${TIFF}/include)
+ set(TIFF_LIBPATH ${TIFF}/lib)
endif()
if(WITH_JACK)
- set(JACK_INCLUDE_DIRS
- ${LIBDIR}/jack/include/jack
- ${LIBDIR}/jack/include
- )
- set(JACK_LIBRARIES ${LIBDIR}/jack/lib/libjack.lib)
+ set(JACK ${LIBDIR}/jack)
+ set(JACK_INCLUDE_DIRS ${JACK}/include/jack
${JACK}/include)
+ set(JACK_LIBRARIES libjack)
+ set(JACK_LIBPATH ${JACK}/lib)
endif()
if(WITH_PYTHON)
@@ -711,24 +696,23 @@
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 "/MACHINE:X64 /OPT:NOREF
${PLATFORM_LINKFLAGS}")
+ 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\" ")
else()
- set(PLATFORM_LINKFLAGS "/MACHINE:IX86
/LARGEADDRESSAWARE ${PLATFORM_LINKFLAGS}")
+ set(PLATFORM_LINKFLAGS "/SUBSYSTEM:CONSOLE
/MACHINE:IX86 /STACK:2097152 /INCREMENTAL:NO /LARGEADDRESSAWARE
/NODEFAULTLIB:\"msvcrt.lib\" /NODEFAULTLIB:\"msvcmrt.lib\"
/NODEFAULTLIB:\"msvcurt.lib\" /NODEFAULTLIB:\"msvcrtd.lib\" ")
endif()
- set(PLATFORM_LINKFLAGS_DEBUG "/NODEFAULTLIB:libcmt.lib
/NODEFAULTLIB:libc.lib")
+ set(CMAKE_EXE_LINKER_FLAGS_DEBUG
"${CMAKE_EXE_LINKER_FLAGS_DEBUG} /NODEFAULTLIB:libcmt.lib;libc.lib ")
else()
# keep GCC spesific stuff here
if(CMAKE_COMPILER_IS_GNUCC)
- set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32
-lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
+ set(LLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt
-lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid")
set(PLATFORM_CFLAGS "-pipe -funsigned-char
-fno-strict-aliasing")
- add_definitions(-D_LARGEFILE_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
+ 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")
endif()
add_definitions(-DFREE_WINDOWS)
@@ -938,7 +922,7 @@
set(SAMPLERATE_LIBPATH ${SAMPLERATE}/lib)
endif()
- set(PLATFORM_LINKLIBS stdc++ SystemStubs)
+ set(LLIBS stdc++ SystemStubs)
if(WITH_COCOA)
set(PLATFORM_CFLAGS "-pipe -funsigned-char -DGHOST_COCOA")
@@ -1015,7 +999,7 @@
# Common.
if(APPLE OR WIN32)
- if(NOT IS_DIRECTORY "${LIBDIR}")
+ if(NOT EXISTS "${LIBDIR}/")
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
