[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29099] branches/soc-2010-jwilkins: merged with head

Jason Wilkins Jason.A.Wilkins at gmail.com
Mon May 31 08:01:12 CEST 2010


Revision: 29099
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29099
Author:   jwilkins
Date:     2010-05-31 08:01:12 +0200 (Mon, 31 May 2010)

Log Message:
-----------
merged with head

Modified Paths:
--------------
    branches/soc-2010-jwilkins/CMakeLists.txt
    branches/soc-2010-jwilkins/SConstruct
    branches/soc-2010-jwilkins/config/linuxcross-config.py
    branches/soc-2010-jwilkins/config/win32-mingw-config.py
    branches/soc-2010-jwilkins/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2010-jwilkins/release/scripts/modules/add_object_utils.py
    branches/soc-2010-jwilkins/release/scripts/modules/bpy/__init__.py
    branches/soc-2010-jwilkins/release/scripts/op/add_mesh_torus.py
    branches/soc-2010-jwilkins/release/scripts/op/console_python.py
    branches/soc-2010-jwilkins/release/scripts/op/sequencer.py
    branches/soc-2010-jwilkins/release/scripts/ui/properties_particle.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_sequencer.py
    branches/soc-2010-jwilkins/release/scripts/ui/space_userpref.py
    branches/soc-2010-jwilkins/source/blender/blenkernel/BKE_particle.h
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/anim.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle.c
    branches/soc-2010-jwilkins/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2010-jwilkins/source/blender/blenloader/intern/readfile.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface.c
    branches/soc-2010-jwilkins/source/blender/editors/interface/interface_handlers.c
    branches/soc-2010-jwilkins/source/blender/editors/physics/particle_edit.c
    branches/soc-2010-jwilkins/source/blender/editors/sound/sound_ops.c
    branches/soc-2010-jwilkins/source/blender/editors/space_logic/logic_window.c
    branches/soc-2010-jwilkins/source/blender/editors/space_sequencer/sequencer_add.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2010-jwilkins/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2010-jwilkins/source/blender/imbuf/IMB_thumbs.h
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs.c
    branches/soc-2010-jwilkins/source/blender/imbuf/intern/thumbs_blend.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2010-jwilkins/source/blender/makesrna/intern/rna_space.c
    branches/soc-2010-jwilkins/source/blender/python/BPY_extern.h
    branches/soc-2010-jwilkins/source/blender/python/doc/blender-org/layout.html
    branches/soc-2010-jwilkins/source/blender/python/doc/blender-org/static/default.css_t
    branches/soc-2010-jwilkins/source/blender/python/doc/sphinx_doc_gen.py
    branches/soc-2010-jwilkins/source/blender/python/generic/mathutils_vector.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_driver.c
    branches/soc-2010-jwilkins/source/blender/python/intern/bpy_interface.c
    branches/soc-2010-jwilkins/source/blender/render/intern/source/convertblender.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2010-jwilkins/source/blender/windowmanager/wm_event_types.h
    branches/soc-2010-jwilkins/source/creator/CMakeLists.txt
    branches/soc-2010-jwilkins/source/creator/creator.c
    branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.events.rst
    branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.logic.rst
    branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.render.rst
    branches/soc-2010-jwilkins/source/gameengine/PyDoc/bge.types.rst

Added Paths:
-----------
    branches/soc-2010-jwilkins/source/blender/python/doc/sphinx_html_compact.diff

Modified: branches/soc-2010-jwilkins/CMakeLists.txt
===================================================================
--- branches/soc-2010-jwilkins/CMakeLists.txt	2010-05-31 05:46:16 UTC (rev 29098)
+++ branches/soc-2010-jwilkins/CMakeLists.txt	2010-05-31 06:01:12 UTC (rev 29099)
@@ -1,4 +1,4 @@
- # $Id$
+# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
@@ -162,20 +162,24 @@
 	FIND_PACKAGE(Freetype)
 	# UNSET(FREETYPE_INCLUDE_DIRS CACHE) # cant use
 
-	# No way to set py31. remove for now.
-	# FIND_PACKAGE(PythonLibs)
-	SET(PYTHON /usr)
-	SET(PYTHON_VERSION 3.1)
-	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
-	# SET(PYTHON_BINARY python) # not used yet
-	SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
-	SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
-  
-	# FIND_PACKAGE(PythonInterp) # not used yet
-	# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
-  
-	SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
 
+	IF(WITH_PYTHON)
+		# No way to set py31. remove for now.
+		# FIND_PACKAGE(PythonLibs)
+		SET(PYTHON /usr)
+		SET(PYTHON_VERSION 3.1)
+		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
+		# SET(PYTHON_BINARY python) # not used yet
+		SET(PYTHON_LIB python${PYTHON_VERSION} CACHE STRING "")
+		SET(PYTHON_LIBPATH ${PYTHON}/lib CACHE STRING "")
+	
+		# FIND_PACKAGE(PythonInterp) # not used yet
+		# SET(PYTHON_BINARY ${PYTHON_EXECUTABLE} CACHE STRING "")
+
+		SET(PYTHON_LINKFLAGS "-Xlinker -export-dynamic")
+	ENDIF(WITH_PYTHON)
+
+
 	IF(WITH_SDL)
 		FIND_PACKAGE(SDL)
 		# UNSET(SDLMAIN_LIBRARY CACHE)
@@ -184,23 +188,27 @@
 		ENDIF(NOT SDL_FOUND)
 	ENDIF(WITH_SDL)
 
-	SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
-	FIND_PATH(OPENEXR_INC
-		ImfXdr.h
-		PATHS
-		${OPENEXR}/include/OpenEXR
-		/usr/local/include/OpenEXR
-		/sw/include/OpenEXR
-		/opt/local/include/OpenEXR
-		/opt/csw/include/OpenEXR
-		/opt/include/OpenEXR
-	)
-	SET(OPENEXR_LIB Half IlmImf Iex Imath)
+	IF(WITH_OPENEXR)
+		SET(OPENEXR /usr CACHE FILEPATH "OPENEXR Directory")
+		FIND_PATH(OPENEXR_INC
+			ImfXdr.h
+			PATHS
+			${OPENEXR}/include/OpenEXR
+			/usr/local/include/OpenEXR
+			/sw/include/OpenEXR
+			/opt/local/include/OpenEXR
+			/opt/csw/include/OpenEXR
+			/opt/include/OpenEXR
+		)
+		SET(OPENEXR_LIB Half IlmImf Iex Imath)
+	ENDIF(WITH_OPENEXR)
 
-	SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
-	SET(FFMPEG_INC ${FFMPEG}/include)
-	SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
-	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	IF(WITH_FFMPEG)
+		SET(FFMPEG /usr CACHE FILEPATH "FFMPEG Directory")
+		SET(FFMPEG_INC ${FFMPEG}/include)
+		SET(FFMPEG_LIB avformat avcodec avutil avdevice swscale CACHE STRING "FFMPEG Libraries")
+		SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+	ENDIF(WITH_FFMPEG)
   
 	IF(WITH_FFTW3)
 		SET(FFTW3 /usr)
@@ -247,6 +255,10 @@
 	IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		# BSD's dont use libdl.so
 		SET(LLIBS "${LLIBS} -ldl")
+
+		# binreloc is linux only
+		SET(BINRELOC ${CMAKE_SOURCE_DIR}/extern/binreloc)
+		SET(BINRELOC_INC ${BINRELOC}/include)
 	ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
 	IF(WITH_OPENMP)
@@ -267,6 +279,7 @@
 	INCLUDE_DIRECTORIES(${JPEG_INCLUDE_DIR} ${PNG_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} )
 ENDIF(UNIX AND NOT APPLE)
 
+
 IF(WIN32)
 
 	# this file is included anyway when building under Windows with cl.exe
@@ -279,26 +292,45 @@
 		message("64 bit compiler detected.")
 		SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/win64)
 	ENDIF(CMAKE_CL_64)
+	
+	ADD_DEFINITIONS(-DWIN32)
 
-	SET(PYTHON ${LIBDIR}/python)
-	SET(PYTHON_VERSION 3.1)
-	SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
-	# SET(PYTHON_BINARY python) # not used yet
-	SET(PYTHON_LIB python31)
-	SET(PYTHON_LIBPATH ${PYTHON}/lib)
+	SET(ICONV ${LIBDIR}/iconv)
+	SET(ICONV_INC ${ICONV}/include)
+	SET(ICONV_LIB iconv)
+	SET(ICONV_LIBPATH ${ICONV}/lib)
 
-	SET(OPENAL ${LIBDIR}/openal)
-	SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
-	SET(OPENAL_LIBRARY wrap_oal)
-	SET(OPENAL_LIBPATH ${OPENAL}/lib)
+	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
+	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
+	SET(LIBSAMPLERATE_LIB libsamplerate)
+	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
 
-	IF(WITH_JACK)
-		SET(JACK ${LIBDIR}/jack)
-		SET(JACK_INC ${JACK}/include/jack ${JACK}/include)
-		SET(JACK_LIB libjack)
-		SET(JACK_LIBPATH ${JACK}/lib)
-	ENDIF(WITH_JACK)
+	SET(PNG "${LIBDIR}/png")
+	SET(PNG_INC "${PNG}/include")
+	SET(PNG_LIBPATH ${PNG}/lib)
 
+	SET(JPEG "${LIBDIR}/jpeg")
+	SET(JPEG_INC "${JPEG}/include")
+	SET(JPEG_LIBPATH ${JPEG}/lib)
+
+	SET(WINTAB_INC ${LIBDIR}/wintab/include) 
+
+	IF(WITH_PYTHON)
+		SET(PYTHON ${LIBDIR}/python)
+		SET(PYTHON_VERSION 3.1)
+		SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+		# SET(PYTHON_BINARY python) # not used yet
+		SET(PYTHON_LIB python31)
+		SET(PYTHON_LIBPATH ${PYTHON}/lib)
+	ENDIF(WITH_PYTHON)
+
+	IF(WITH_OPENAL)
+		SET(OPENAL ${LIBDIR}/openal)
+		SET(OPENAL_INCLUDE_DIR ${OPENAL}/include)
+		SET(OPENAL_LIBRARY wrap_oal)
+		SET(OPENAL_LIBPATH ${OPENAL}/lib)
+	ENDIF(WITH_OPENAL)
+
 	IF(WITH_SNDFILE)
 		SET(SNDFILE ${LIBDIR}/sndfile)
 		SET(SNDFILE_INC ${SNDFILE}/include)
@@ -306,140 +338,241 @@
 		SET(SNDFILE_LIBPATH ${SNDFILE}/lib)
 	ENDIF(WITH_SNDFILE)
 
-	IF(CMAKE_CL_64)
-		SET(PNG_LIBRARIES libpng)
-	ELSE(CMAKE_CL_64)
-		SET(PNG_LIBRARIES libpng_st)
-	ENDIF(CMAKE_CL_64)
-	SET(JPEG_LIBRARY libjpeg)
+	IF(WITH_SDL)
+		SET(SDL ${LIBDIR}/sdl)
+		SET(SDL_INCLUDE_DIR ${SDL}/include)
+		SET(SDL_LIBRARY SDL)
+		SET(SDL_LIBPATH ${SDL}/lib)
+	ENDIF(WITH_SDL)
 
-	SET(ZLIB ${LIBDIR}/zlib)
-	SET(ZLIB_INC ${ZLIB}/include)
-	IF(CMAKE_CL_64)
-		SET(ZLIB_LIBRARIES libz)
-	ELSE(CMAKE_CL_64)
-		SET(ZLIB_LIBRARIES zlib)
-	ENDIF(CMAKE_CL_64)
-	SET(ZLIB_LIBPATH ${ZLIB}/lib)
-  
-	SET(PTHREADS ${LIBDIR}/pthreads)
-	SET(PTHREADS_INC ${PTHREADS}/include)
-	SET(PTHREADS_LIB pthreadVC2)
-	SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
-  
-	SET(ICONV ${LIBDIR}/iconv)
-	SET(ICONV_INC ${ICONV}/include)
-	SET(ICONV_LIB iconv)
-	SET(ICONV_LIBPATH ${ICONV}/lib)
-  
-	IF(WITH_FFTW3)
-		SET(FFTW3 ${LIBDIR}/fftw3)
-		SET(FFTW3_INC ${FFTW3}/include)
-		SET(FFTW3_LIB libfftw)
-		SET(FFTW3_LIBPATH ${FFTW3}/lib)
-	ENDIF(WITH_FFTW3)
-  
-	SET(GETTEXT ${LIBDIR}/gettext)
-	SET(GETTEXT_INC ${GETTEXT}/include)
-	IF(CMAKE_CL_64)
-		SET(GETTEXT_LIB gettext)
-	ELSE(CMAKE_CL_64)
-		SET(GETTEXT_LIB gnu_gettext)
-	ENDIF(CMAKE_CL_64)
-	SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+	IF(WITH_QUICKTIME)
+		SET(QUICKTIME ${LIBDIR}/QTDevWin)
+		SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
+		SET(QUICKTIME_LIB qtmlClient)
+		SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
+	ENDIF(WITH_QUICKTIME)
 
-	SET(FREETYPE ${LIBDIR}/freetype)
-	SET(FREETYPE_INCLUDE_DIRS ${FREETYPE}/include ${FREETYPE}/include/freetype2)
-	SET(FREETYPE_LIBPATH ${FREETYPE}/lib)
-	SET(FREETYPE_LIBRARY freetype2ST)
-  
-	SET(OPENEXR ${LIBDIR}/openexr)
-	SET(OPENEXR_INC ${OPENEXR}/include ${OPENEXR}/include/IlmImf ${OPENEXR}/include/Iex ${OPENEXR}/include/Imath)
-	SET(OPENEXR_LIB Iex Half IlmImf Imath IlmThread)
-	IF (MSVC80)
-		SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2005)
-	ELSE (MSVC80)
-		SET(OPENEXR_LIBPATH ${OPENEXR}/lib_msvc)
-	ENDIF(MSVC80)
-	IF (MSVC90)
-		SET(OPENEXR_LIBPATH ${OPENEXR}/lib_vs2008)
-	ENDIF(MSVC90)
+	IF(MSVC)
+		IF(CMAKE_CL_64)
+			SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+		ELSE(CMAKE_CL_64)
+			SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+		ENDIF(CMAKE_CL_64)
+		
+		SET(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305" 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 /wd4800 /wd4244 /wd4305" CACHE STRING "MSVC MT C++ flags " FORCE)
 
-  
-	SET(QUICKTIME ${LIBDIR}/QTDevWin)
-	SET(QUICKTIME_INC ${QUICKTIME}/CIncludes)
-	SET(QUICKTIME_LIB qtmlClient)
-	SET(QUICKTIME_LIBPATH ${QUICKTIME}/Libraries)
+		SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+		SET(CMAKE_CXX_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+		SET(CMAKE_CXX_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+		SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+		SET(CMAKE_C_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /ZI /J" CACHE STRING "MSVC MT flags " FORCE)
+		SET(CMAKE_C_FLAGS_RELEASE "/O2 /Ob2 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+		SET(CMAKE_C_FLAGS_MINSIZEREL "/O1 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /J" CACHE STRING "MSVC MT flags " FORCE)
+		SET(CMAKE_C_FLAGS_RELWITHDEBINFO "/O2 /Ob1 /DNDEBUG /EHsc /MT /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
+		
+		IF(WITH_OPENMP)
+			SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /openmp ")
+			SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp ")
+		ENDIF(WITH_OPENMP)
+		
+		SET(GETTEXT ${LIBDIR}/gettext)
+		SET(GETTEXT_INC ${GETTEXT}/include)
+		SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
+		IF(CMAKE_CL_64)
+			SET(GETTEXT_LIB gettext)
+		ELSE(CMAKE_CL_64)
+			SET(GETTEXT_LIB gnu_gettext)
+		ENDIF(CMAKE_CL_64)
 
-	SET(FFMPEG ${LIBDIR}/ffmpeg)
-	SET(FFMPEG_INC ${FFMPEG}/include ${FFMPEG}/include/msvc)
-	SET(FFMPEG_LIB avcodec-52 avformat-52 avdevice-52 avutil-50 swscale-0)
-	SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+		IF(CMAKE_CL_64)
+			SET(PNG_LIBRARIES libpng)
+		ELSE(CMAKE_CL_64)
+			SET(PNG_LIBRARIES libpng_st)
+		ENDIF(CMAKE_CL_64)
+		SET(JPEG_LIBRARY libjpeg)
 
-	SET(LIBSAMPLERATE ${LIBDIR}/samplerate)
-	SET(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
-	SET(LIBSAMPLERATE_LIB libsamplerate)
-	SET(LIBSAMPLERATE_LIBPATH ${LIBSAMPLERATE}/lib)
+		SET(ZLIB ${LIBDIR}/zlib)
+		SET(ZLIB_INC ${ZLIB}/include)
+		SET(ZLIB_LIBPATH ${ZLIB}/lib)
+		IF(CMAKE_CL_64)
+			SET(ZLIB_LIBRARIES libz)
+		ELSE(CMAKE_CL_64)
+			SET(ZLIB_LIBRARIES zlib)
+		ENDIF(CMAKE_CL_64)
 
-	IF(CMAKE_CL_64)
-		SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
-	ELSE(CMAKE_CL_64)
-		SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
-	ENDIF(CMAKE_CL_64)
+		SET(PTHREADS ${LIBDIR}/pthreads)
+		SET(PTHREADS_INC ${PTHREADS}/include)
+		SET(PTHREADS_LIBPATH ${PTHREADS}/lib)
+		SET(PTHREADS_LIB pthreadVC2)
+		
+		SET(FREETYPE ${LIBDIR}/freetype)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list