[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19221] branches/bmesh/blender: merge with 2.5 at 19207, plus some half-finished walker stuff
Joseph Eagar
joeedh at gmail.com
Sun Mar 8 08:15:44 CET 2009
Revision: 19221
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19221
Author: joeedh
Date: 2009-03-08 08:15:41 +0100 (Sun, 08 Mar 2009)
Log Message:
-----------
merge with 2.5 at 19207, plus some half-finished walker stuff
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/intern/ghost/GHOST_C-api.h
branches/bmesh/blender/intern/ghost/GHOST_ISystem.h
branches/bmesh/blender/intern/ghost/intern/GHOST_C-api.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_System.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCarbon.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemWin32.h
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.cpp
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemX11.h
branches/bmesh/blender/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/blenfont/BLF_blenfont.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
branches/bmesh/blender/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
branches/bmesh/blender/projectfiles_vc9/gameengine/converter/KX_converter.vcproj
branches/bmesh/blender/source/blender/blenfont/BLF_api.h
branches/bmesh/blender/source/blender/blenfont/SConscript
branches/bmesh/blender/source/blender/blenfont/intern/blf.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_font.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_glyph.c
branches/bmesh/blender/source/blender/blenfont/intern/blf_internal.h
branches/bmesh/blender/source/blender/blenfont/intern/blf_internal_types.h
branches/bmesh/blender/source/blender/blenkernel/BKE_brush.h
branches/bmesh/blender/source/blender/blenkernel/BKE_context.h
branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
branches/bmesh/blender/source/blender/blenkernel/BKE_particle.h
branches/bmesh/blender/source/blender/blenkernel/BKE_text.h
branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
branches/bmesh/blender/source/blender/blenkernel/intern/context.c
branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
branches/bmesh/blender/source/blender/blenkernel/intern/image.c
branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
branches/bmesh/blender/source/blender/blenkernel/intern/particle_system.c
branches/bmesh/blender/source/blender/blenkernel/intern/text.c
branches/bmesh/blender/source/blender/blenlib/intern/arithb.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/bmesh/bmesh_operators.h
branches/bmesh/blender/source/blender/bmesh/bmesh_walkers.h
branches/bmesh/blender/source/blender/bmesh/intern/bmesh_walkers.c
branches/bmesh/blender/source/blender/editors/animation/anim_channels.c
branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
branches/bmesh/blender/source/blender/editors/animation/keyframes_draw.c
branches/bmesh/blender/source/blender/editors/animation/keyframes_edit.c
branches/bmesh/blender/source/blender/editors/animation/keyframes_general.c
branches/bmesh/blender/source/blender/editors/animation/keyframing.c
branches/bmesh/blender/source/blender/editors/armature/armature_intern.h
branches/bmesh/blender/source/blender/editors/armature/armature_ops.c
branches/bmesh/blender/source/blender/editors/armature/editarmature.c
branches/bmesh/blender/source/blender/editors/curve/curve_intern.h
branches/bmesh/blender/source/blender/editors/curve/curve_ops.c
branches/bmesh/blender/source/blender/editors/curve/editfont.c
branches/bmesh/blender/source/blender/editors/include/ED_anim_api.h
branches/bmesh/blender/source/blender/editors/include/ED_armature.h
branches/bmesh/blender/source/blender/editors/include/ED_curve.h
branches/bmesh/blender/source/blender/editors/include/ED_datafiles.h
branches/bmesh/blender/source/blender/editors/include/ED_fileselect.h
branches/bmesh/blender/source/blender/editors/include/ED_image.h
branches/bmesh/blender/source/blender/editors/include/ED_keyframes_edit.h
branches/bmesh/blender/source/blender/editors/include/ED_mesh.h
branches/bmesh/blender/source/blender/editors/include/ED_particle.h
branches/bmesh/blender/source/blender/editors/include/ED_view3d.h
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/include/UI_resources.h
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
branches/bmesh/blender/source/blender/editors/interface/interface_utils.c
branches/bmesh/blender/source/blender/editors/interface/view2d.c
branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c
branches/bmesh/blender/source/blender/editors/mesh/editmesh_add.c
branches/bmesh/blender/source/blender/editors/mesh/meshtools.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/physics/editparticle.c
branches/bmesh/blender/source/blender/editors/screen/screen_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_image.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_intern.h
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_ops.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_action/action_draw.c
branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
branches/bmesh/blender/source/blender/editors/space_action/action_header.c
branches/bmesh/blender/source/blender/editors/space_action/action_select.c
branches/bmesh/blender/source/blender/editors/space_file/file_draw.c
branches/bmesh/blender/source/blender/editors/space_file/file_header.c
branches/bmesh/blender/source/blender/editors/space_file/file_ops.c
branches/bmesh/blender/source/blender/editors/space_file/space_file.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_draw.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_edit.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_header.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_intern.h
branches/bmesh/blender/source/blender/editors/space_graph/graph_ops.c
branches/bmesh/blender/source/blender/editors/space_graph/graph_select.c
branches/bmesh/blender/source/blender/editors/space_graph/space_graph.c
branches/bmesh/blender/source/blender/editors/space_image/image_header.c
branches/bmesh/blender/source/blender/editors/space_image/image_intern.h
branches/bmesh/blender/source/blender/editors/space_image/image_ops.c
branches/bmesh/blender/source/blender/editors/space_image/image_panels.c
branches/bmesh/blender/source/blender/editors/space_image/space_image.c
branches/bmesh/blender/source/blender/editors/space_info/info_header.c
branches/bmesh/blender/source/blender/editors/space_info/space_info.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_ops.c
branches/bmesh/blender/source/blender/editors/space_script/script_edit.c
branches/bmesh/blender/source/blender/editors/space_script/space_script.c
branches/bmesh/blender/source/blender/editors/space_text/Makefile
branches/bmesh/blender/source/blender/editors/space_text/SConscript
branches/bmesh/blender/source/blender/editors/space_text/space_text.c
branches/bmesh/blender/source/blender/editors/space_text/text_header.c
branches/bmesh/blender/source/blender/editors/space_text/text_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/editors/transform/transform.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/editors/transform/transform_manipulator.c
branches/bmesh/blender/source/blender/editors/util/undo.c
branches/bmesh/blender/source/blender/imbuf/IMB_thumbs.h
branches/bmesh/blender/source/blender/imbuf/intern/thumbs.c
branches/bmesh/blender/source/blender/makesdna/DNA_particle_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_scene_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_text_types.h
branches/bmesh/blender/source/blender/makesdna/intern/SConscript
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/RNA_define.h
branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/makesrna/intern/SConscript
branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_action.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_pose.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c
branches/bmesh/blender/source/blender/windowmanager/WM_api.h
branches/bmesh/blender/source/blender/windowmanager/WM_types.h
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c
branches/bmesh/blender/source/blender/windowmanager/wm_event_types.h
branches/bmesh/blender/source/creator/creator.c
Added Paths:
-----------
branches/bmesh/blender/config/win64-vc-config.py
branches/bmesh/blender/release/datafiles/bmonofont.ttf
branches/bmesh/blender/source/blender/editors/datafiles/bmonofont.ttf.c
branches/bmesh/blender/source/blender/editors/include/ED_text.h
branches/bmesh/blender/source/blender/editors/space_text/text_draw.c
branches/bmesh/blender/source/blender/editors/space_text/text_ops.c
branches/bmesh/blender/source/blender/editors/space_text/text_python.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_timeline.c
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2009-03-07 15:23:03 UTC (rev 19220)
+++ branches/bmesh/blender/CMakeLists.txt 2009-03-08 07:15:41 UTC (rev 19221)
@@ -348,22 +348,28 @@
SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
- IF(OPENAL_FOUND)
- SET(WITH_OPENAL ON)
- SET(OPENAL_LIB ${OPENAL_LIBRARY})
- SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
- ELSE(OPENAL_FOUND)
- SET(WITH_OPENAL OFF)
- ENDIF(OPENAL_FOUND)
+ IF(WITH_OPENAL)
+ INCLUDE(${CMAKE_ROOT}/Modules/FindOpenAL.cmake)
+ IF(OPENAL_FOUND)
+ SET(WITH_OPENAL ON)
+ SET(OPENAL_LIB ${OPENAL_LIBRARY})
+ SET(OPENAL_INC ${OPENAL_INCLUDE_DIR})
+ ELSE(OPENAL_FOUND)
+ SET(WITH_OPENAL OFF)
+ ENDIF(OPENAL_FOUND)
+ ENDIF(WITH_OPENAL)
SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
- SET(PYTHON_VERSION 2.3)
+ SET(PYTHON_VERSION 2.5)
SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "")
SET(PYTHON_LIB "")
SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
- SET(PYTHON_LINKFLAGS "-u __dummy -u _PyMac_Error -framework System -framework Python")
+ IF(CMAKE_SYSTEM_VERSION GREATER 10.4)
+ SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
+ ELSE(CMAKE_SYSTEM_VERSION GREATER 10.4)
+ SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
+ ENDIF(CMAKE_SYSTEM_VERSION GREATER 10.4)
SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_INC "${GETTEXT}/include")
Copied: branches/bmesh/blender/config/win64-vc-config.py (from rev 19207, branches/blender2.5/blender/config/win64-vc-config.py)
===================================================================
--- branches/bmesh/blender/config/win64-vc-config.py (rev 0)
+++ branches/bmesh/blender/config/win64-vc-config.py 2009-03-08 07:15:41 UTC (rev 19221)
@@ -0,0 +1,212 @@
+LCGDIR = '#../lib/win64'
+LIBDIR = '${LCGDIR}'
+
+# enable ffmpeg support
+WITH_BF_FFMPEG = False # -DWITH_FFMPEG
+BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+BF_FFMPEG_LIB = 'avformat-52.lib avcodec-51.lib avdevice-52.lib avutil-49.lib swscale-0.lib'
+
+BF_PYTHON = LIBDIR + '/python'
+BF_PYTHON_VERSION = '2.5'
+BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
+BF_PYTHON_BINARY = 'python'
+BF_PYTHON_LIB = 'python25'
+BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
+
+WITH_BF_OPENAL = False
+WITH_BF_STATICOPENAL = False
+BF_OPENAL = LIBDIR + '/openal'
+BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
+BF_OPENAL_LIB = 'dxguid openal_static'
+BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+
+# TODO - are these useful on win32?
+# BF_CXX = '/usr'
+# WITH_BF_STATICCXX = False
+# BF_CXX_LIB_STATIC = '${BF_CXX}/lib/libstdc++.a'
+
+WITH_BF_ICONV = True
+BF_ICONV = LIBDIR + '/iconv'
+BF_ICONV_INC = '${BF_ICONV}/include'
+BF_ICONV_LIB = 'iconv'
+BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+
+WITH_BF_SDL = True
+BF_SDL = LIBDIR + '/sdl'
+BF_SDL_INC = '${BF_SDL}/include'
+BF_SDL_LIB = 'SDL.lib'
+BF_SDL_LIBPATH = '${BF_SDL}/lib'
+
+BF_PTHREADS = LIBDIR + '/pthreads'
+BF_PTHREADS_INC = '${BF_PTHREADS}/include'
+BF_PTHREADS_LIB = 'pthreadVC2'
+BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
+
+WITH_BF_FMOD = False
+BF_FMOD = LIBDIR + '/fmod'
+
+WITH_BF_OPENEXR = True
+WITH_BF_STATICOPENEXR = False
+BF_OPENEXR = LIBDIR + '/openexr'
+BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
+BF_OPENEXR_LIB = ' Iex Half IlmImf Imath IlmThread '
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_vs2008'
+# Warning, this static lib configuration is untested! users of this OS please confirm.
+BF_OPENEXR_LIB_STATIC = '${BF_OPENEXR}/lib/libHalf.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_OPENEXR}/lib/libIex.a ${BF_OPENEXR}/lib/libImath.a ${BF_OPENEXR}/lib/libIlmThread.a'
+
+WITH_BF_DDS = True
+
+WITH_BF_JPEG = True
+BF_JPEG = LIBDIR + '/jpeg'
+BF_JPEG_INC = '${BF_JPEG}/include'
+BF_JPEG_LIB = 'libjpeg'
+BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
+
+WITH_BF_PNG = True
+BF_PNG = LIBDIR + '/png'
+BF_PNG_INC = '${BF_PNG}/include'
+BF_PNG_LIB = 'libpng'
+BF_PNG_LIBPATH = '${BF_PNG}/lib'
+
+BF_TIFF = LIBDIR + '/tiff'
+BF_TIFF_INC = '${BF_TIFF}/include'
+BF_TIFF_LIB = 'libtiff'
+BF_TIFF_LIBPATH = '${BF_TIFF}/lib'
+
+WITH_BF_ZLIB = True
+BF_ZLIB = LIBDIR + '/zlib'
+BF_ZLIB_INC = '${BF_ZLIB}/include'
+BF_ZLIB_LIB = 'libz'
+BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
+
+WITH_BF_INTERNATIONAL = False
+
+BF_GETTEXT = LIBDIR + '/gettext'
+BF_GETTEXT_INC = '${BF_GETTEXT}/include'
+BF_GETTEXT_LIB = 'gnu_gettext'
+BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
+
+WITH_BF_FTGL = False
+BF_FTGL = LIBDIR + '/ftgl'
+BF_FTGL_INC = '${BF_FTGL}/include'
+BF_FTGL_LIB = 'extern_ftgl'
+
+WITH_BF_GAMEENGINE = True
+WITH_BF_PLAYER = False
+
+WITH_BF_ODE = True
+BF_ODE = LIBDIR + '/ode'
+BF_ODE_INC = BF_ODE + '/include'
+BF_ODE_LIB = BF_ODE + '/lib/libode.a'
+
+WITH_BF_BULLET = True
+BF_BULLET = '#extern/bullet2/src'
+BF_BULLET_INC = '${BF_BULLET}'
+BF_BULLET_LIB = 'extern_bullet'
+
+BF_SOLID = '#extern/solid'
+BF_SOLID_INC = '${BF_SOLID}'
+BF_SOLID_LIB = 'extern_solid'
+
+BF_WINTAB = LIBDIR + '/wintab'
+BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
+
+WITH_BF_YAFRAY = True
+
+WITH_BF_BINRELOC = False
+
+#WITH_BF_NSPR = True
+#BF_NSPR = $(LIBDIR)/nspr
+#BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
+#BF_NSPR_LIB =
+
+# Uncomment the following line to use Mozilla inplace of netscape
+#CPPFLAGS += -DMOZ_NOT_NET
+# Location of MOZILLA/Netscape header files...
+#BF_MOZILLA = $(LIBDIR)/mozilla
+#BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
+#BF_MOZILLA_LIB =
+# Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
+# if this is not set.
+#
+# Be paranoid regarding library creation (do not update archives)
+#BF_PARANOID = True
+
+# enable freetype2 support for text objects
+BF_WITH_FREETYPE = True
+BF_FREETYPE = LIBDIR + '/freetype'
+BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
+BF_FREETYPE_LIB = 'freetype2ST'
+BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
+
+WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME
+BF_QUICKTIME = LIBDIR + '/QTDevWin'
+BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
+BF_QUICKTIME_LIB = 'qtmlClient'
+BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
+
+WITH_BF_OPENJPEG = False
+BF_OPENJPEG = '#extern/libopenjpeg'
+BF_OPENJPEG_LIB = ''
+BF_OPENJPEG_INC = '${BF_OPENJPEG}'
+BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
+
+WITH_BF_REDCODE = False
+BF_REDCODE_INC = '#extern'
+
+WITH_BF_STATICOPENGL = False
+BF_OPENGL_INC = '${BF_OPENGL}/include'
+BF_OPENGL_LIBINC = '${BF_OPENGL}/lib'
+BF_OPENGL_LIB = 'opengl32 glu32'
+BF_OPENGL_LIB_STATIC = [ '${BF_OPENGL}/lib/libGL.a', '${BF_OPENGL}/lib/libGLU.a',
+ '${BF_OPENGL}/lib/libXmu.a', '${BF_OPENGL}/lib/libXext.a',
+ '${BF_OPENGL}/lib/libX11.a', '${BF_OPENGL}/lib/libXi.a' ]
+CC = 'cl.exe'
+CXX = 'cl.exe'
+
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT']
+CXXFLAGS = ['/EHsc']
+
+BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
+
+CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
+REL_CFLAGS = ['-O2', '-DNDEBUG']
+REL_CCFLAGS = ['-O2', '-DNDEBUG']
+REL_CXXFLAGS = ['-O2', '-DNDEBUG']
+
+C_WARN = []
+CC_WARN = []
+CXX_WARN = []
+
+LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
+
+WITH_BF_DOCS=False
+
+BF_DEBUG=False
+BF_BSC=False
+CFLAGS = []
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/MT', '/openmp']
+CXXFLAGS = ['/EHsc']
+
+if BF_DEBUG:
+ BF_NUMJOBS=1
+else:
+ BF_NUMJOBS=6
+
+PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/ENTRY:mainCRTStartup','/INCREMENTAL:NO','/NODEFAULTLIB:"msvcprt.lib"','/NODEFAULTLIB:"glut32.lib"','/NODEFAULTLIB:"libc.lib"','/NODEFAULTLIB:"libcd.lib"','/NODEFAULTLIB:"libcpd.lib"','/NODEFAULTLIB:"libcp.lib"','/LARGEADDRESSAWARE']
+
+BF_BUILDDIR = '..\\build\\blender25-win64-vc'
+BF_INSTALLDIR='..\\install\\blender25-win64-vc'
+BF_DOCDIR='..\\install\\blender25-win64-vc\\doc'
+
+
+
+######################### MERGE WITH ABOVE ################################
+
+
+
+
Modified: branches/bmesh/blender/intern/ghost/GHOST_C-api.h
===================================================================
--- branches/bmesh/blender/intern/ghost/GHOST_C-api.h 2009-03-07 15:23:03 UTC (rev 19220)
+++ branches/bmesh/blender/intern/ghost/GHOST_C-api.h 2009-03-08 07:15:41 UTC (rev 19221)
@@ -771,14 +771,16 @@
/**
* Return the data from the clipboad
- * @return clipboard data
+ * @param return the selection instead, X11 only feature
+ * @return clipboard data
*/
-extern GHOST_TUns8* GHOST_getClipboard(int flag);
+extern GHOST_TUns8* GHOST_getClipboard(int selection);
/**
* Put data to the Clipboard
+ * @param set the selection instead, X11 only feature
*/
-extern void GHOST_putClipboard(GHOST_TInt8 *buffer, int flag);
+extern void GHOST_putClipboard(GHOST_TInt8 *buffer, int selection);
#ifdef __cplusplus
}
Modified: branches/bmesh/blender/intern/ghost/GHOST_ISystem.h
===================================================================
--- branches/bmesh/blender/intern/ghost/GHOST_ISystem.h 2009-03-07 15:23:03 UTC (rev 19220)
+++ branches/bmesh/blender/intern/ghost/GHOST_ISystem.h 2009-03-08 07:15:41 UTC (rev 19221)
@@ -356,12 +356,12 @@
* @return Returns "unsinged char" from X11 XA_CUT_BUFFER0 buffer
*
*/
- virtual GHOST_TUns8* getClipboard(int flag) const = 0;
+ virtual GHOST_TUns8* getClipboard(bool selection) const = 0;
/**
* Put data to the Clipboard
*/
- virtual void putClipboard(GHOST_TInt8 *buffer, int flag) const = 0;
+ virtual void putClipboard(GHOST_TInt8 *buffer, bool selection) const = 0;
protected:
/**
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_C-api.cpp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list