[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20571] branches/soc-2009-aligorith: NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)

Joshua Leung aligorith at gmail.com
Tue Jun 2 03:41:04 CEST 2009


Revision: 20571
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20571
Author:   aligorith
Date:     2009-06-02 03:40:53 +0200 (Tue, 02 Jun 2009)

Log Message:
-----------
NLA SoC: Merge from 2.5   20441 to 20570 (HEAD)

There were a few conflicts/missing files. Hopefully everything updated ok...

Modified Paths:
--------------
    branches/soc-2009-aligorith/CMakeLists.txt
    branches/soc-2009-aligorith/SConstruct
    branches/soc-2009-aligorith/config/darwin-config.py
    branches/soc-2009-aligorith/config/irix6-config.py
    branches/soc-2009-aligorith/config/linux2-config.py
    branches/soc-2009-aligorith/config/linuxcross-config.py
    branches/soc-2009-aligorith/config/openbsd3-config.py
    branches/soc-2009-aligorith/config/sunos5-config.py
    branches/soc-2009-aligorith/config/win32-mingw-config.py
    branches/soc-2009-aligorith/config/win32-vc-config.py
    branches/soc-2009-aligorith/config/win64-vc-config.py
    branches/soc-2009-aligorith/release/datafiles/blenderbuttons
    branches/soc-2009-aligorith/release/ui/buttons_data_bone.py
    branches/soc-2009-aligorith/release/ui/buttons_data_camera.py
    branches/soc-2009-aligorith/release/ui/buttons_data_curve.py
    branches/soc-2009-aligorith/release/ui/buttons_data_lamp.py
    branches/soc-2009-aligorith/release/ui/buttons_data_mesh.py
    branches/soc-2009-aligorith/release/ui/buttons_data_modifier.py
    branches/soc-2009-aligorith/release/ui/buttons_material.py
    branches/soc-2009-aligorith/release/ui/buttons_objects.py
    branches/soc-2009-aligorith/release/ui/buttons_physic_cloth.py
    branches/soc-2009-aligorith/release/ui/buttons_scene.py
    branches/soc-2009-aligorith/release/ui/buttons_texture.py
    branches/soc-2009-aligorith/release/ui/buttons_world.py
    branches/soc-2009-aligorith/source/Makefile
    branches/soc-2009-aligorith/source/blender/CMakeLists.txt
    branches/soc-2009-aligorith/source/blender/Makefile
    branches/soc-2009-aligorith/source/blender/SConscript
    branches/soc-2009-aligorith/source/blender/blenkernel/BKE_context.h
    branches/soc-2009-aligorith/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/context.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/displist.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/ipo.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/lattice.c
    branches/soc-2009-aligorith/source/blender/blenkernel/intern/modifier.c
    branches/soc-2009-aligorith/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-aligorith/source/blender/editors/animation/keyframing.c
    branches/soc-2009-aligorith/source/blender/editors/armature/poselib.c
    branches/soc-2009-aligorith/source/blender/editors/datafiles/B.blend.c
    branches/soc-2009-aligorith/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2009-aligorith/source/blender/editors/include/UI_interface.h
    branches/soc-2009-aligorith/source/blender/editors/include/UI_resources.h
    branches/soc-2009-aligorith/source/blender/editors/include/UI_view2d.h
    branches/soc-2009-aligorith/source/blender/editors/interface/interface.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_api.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_draw.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_intern.h
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_layout.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_regions.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_style.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_templates.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_utils.c
    branches/soc-2009-aligorith/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-aligorith/source/blender/editors/interface/view2d.c
    branches/soc-2009-aligorith/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-aligorith/source/blender/editors/object/object_edit.c
    branches/soc-2009-aligorith/source/blender/editors/object/object_modifier.c
    branches/soc-2009-aligorith/source/blender/editors/screen/screen_ops.c
    branches/soc-2009-aligorith/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2009-aligorith/source/blender/editors/space_info/info_header.c
    branches/soc-2009-aligorith/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2009-aligorith/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2009-aligorith/source/blender/editors/space_sequencer/sequencer_header.c
    branches/soc-2009-aligorith/source/blender/editors/space_text/text_draw.c
    branches/soc-2009-aligorith/source/blender/editors/space_text/text_ops.c
    branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-aligorith/source/blender/editors/space_view3d/view3d_toolbar.c
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2009-aligorith/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2009-aligorith/source/blender/makesrna/RNA_access.h
    branches/soc-2009-aligorith/source/blender/makesrna/RNA_define.h
    branches/soc-2009-aligorith/source/blender/makesrna/RNA_types.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/makesrna.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_access.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_camera.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_define.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_material.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_object.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_space.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_text.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2009-aligorith/source/blender/makesrna/intern/rna_world.c
    branches/soc-2009-aligorith/source/blender/python/intern/bpy_rna.c
    branches/soc-2009-aligorith/source/blender/python/intern/bpy_ui.c
    branches/soc-2009-aligorith/source/blender/python/intern/bpy_util.c
    branches/soc-2009-aligorith/source/blender/render/CMakeLists.txt
    branches/soc-2009-aligorith/source/blender/render/SConscript
    branches/soc-2009-aligorith/source/blender/render/intern/source/Makefile
    branches/soc-2009-aligorith/source/blender/render/intern/source/convertblender.c
    branches/soc-2009-aligorith/source/blender/render/intern/source/pipeline.c
    branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm.c
    branches/soc-2009-aligorith/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2009-aligorith/source/blender/windowmanager/wm.h
    branches/soc-2009-aligorith/source/nan_compile.mk
    branches/soc-2009-aligorith/tools/btools.py

Added Paths:
-----------
    branches/soc-2009-aligorith/release/ui/buttons_object_constraint.py
    branches/soc-2009-aligorith/release/ui/buttons_particle.py
    branches/soc-2009-aligorith/release/ui/space_outliner.py

Removed Paths:
-------------
    branches/soc-2009-aligorith/release/windows/installer/
    branches/soc-2009-aligorith/release/windows/publ_installer/
    branches/soc-2009-aligorith/source/blender/yafray/

Modified: branches/soc-2009-aligorith/CMakeLists.txt
===================================================================
--- branches/soc-2009-aligorith/CMakeLists.txt	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/CMakeLists.txt	2009-06-02 01:40:53 UTC (rev 20571)
@@ -67,7 +67,6 @@
 OPTION(WITH_OPENAL		"Enable OpenAL Support (http://www.openal.org)"		ON)
 OPTION(WITH_OPENMP		"Enable OpenMP (has to be supported by the compiler)"	OFF)
 OPTION(WITH_WEBPLUGIN		"Enable Web Plugin (Unix only)"				OFF)
-OPTION(WITH_YAFRAY		"Enable Yafray (Renderer)"				OFF)
 
 IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
   MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")

Modified: branches/soc-2009-aligorith/SConstruct
===================================================================
--- branches/soc-2009-aligorith/SConstruct	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/SConstruct	2009-06-02 01:40:53 UTC (rev 20571)
@@ -279,7 +279,6 @@
 	target_env_defs['WITH_BF_OPENJPEG'] = False
 	target_env_defs['WITH_BF_FFMPEG'] = False
 	target_env_defs['WITH_BF_QUICKTIME'] = False
-	target_env_defs['WITH_BF_YAFRAY'] = False
 	target_env_defs['WITH_BF_REDCODE'] = False
 	target_env_defs['WITH_BF_DDS'] = False
 	target_env_defs['WITH_BF_ZLIB'] = False

Modified: branches/soc-2009-aligorith/config/darwin-config.py
===================================================================
--- branches/soc-2009-aligorith/config/darwin-config.py	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/config/darwin-config.py	2009-06-02 01:40:53 UTC (rev 20571)
@@ -155,8 +155,6 @@
 BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
-WITH_BF_YAFRAY = True
-
 #WITH_BF_NSPR = True
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-aligorith/config/irix6-config.py
===================================================================
--- branches/soc-2009-aligorith/config/irix6-config.py	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/config/irix6-config.py	2009-06-02 01:40:53 UTC (rev 20571)
@@ -93,8 +93,6 @@
 BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
-WITH_BF_YAFRAY = 'true'
-
 #WITH_BF_NSPR = 'true'
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-aligorith/config/linux2-config.py
===================================================================
--- branches/soc-2009-aligorith/config/linux2-config.py	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/config/linux2-config.py	2009-06-02 01:40:53 UTC (rev 20571)
@@ -87,8 +87,6 @@
 BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
-WITH_BF_YAFRAY = True
-
 #WITH_BF_NSPR = True
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-aligorith/config/linuxcross-config.py
===================================================================
--- branches/soc-2009-aligorith/config/linuxcross-config.py	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/config/linuxcross-config.py	2009-06-02 01:40:53 UTC (rev 20571)
@@ -1,8 +1,6 @@
 LCGDIR = '#../lib/windows'
 LIBDIR = '${LCGDIR}'
 
-WITH_BF_YAFRAY = True
-
 BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.5'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'

Modified: branches/soc-2009-aligorith/config/openbsd3-config.py
===================================================================
--- branches/soc-2009-aligorith/config/openbsd3-config.py	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/config/openbsd3-config.py	2009-06-02 01:40:53 UTC (rev 20571)
@@ -75,8 +75,6 @@
 BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
-WITH_BF_YAFRAY = True
-
 #WITH_BF_NSPR = True
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-aligorith/config/sunos5-config.py
===================================================================
--- branches/soc-2009-aligorith/config/sunos5-config.py	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/config/sunos5-config.py	2009-06-02 01:40:53 UTC (rev 20571)
@@ -83,8 +83,6 @@
 BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
-WITH_BF_YAFRAY = True
-
 #WITH_BF_NSPR = True
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-aligorith/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-aligorith/config/win32-mingw-config.py	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/config/win32-mingw-config.py	2009-06-02 01:40:53 UTC (rev 20571)
@@ -94,8 +94,6 @@
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 
-WITH_BF_YAFRAY = True
-
 #WITH_BF_NSPR = True
 #BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr

Modified: branches/soc-2009-aligorith/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-aligorith/config/win32-vc-config.py	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/config/win32-vc-config.py	2009-06-02 01:40:53 UTC (rev 20571)
@@ -107,8 +107,6 @@
 BF_WINTAB = LIBDIR + '/wintab'
 BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE'
 
-WITH_BF_YAFRAY = True
-
 WITH_BF_BINRELOC = False
 
 #WITH_BF_NSPR = True

Modified: branches/soc-2009-aligorith/config/win64-vc-config.py
===================================================================
--- branches/soc-2009-aligorith/config/win64-vc-config.py	2009-06-01 22:07:46 UTC (rev 20570)
+++ branches/soc-2009-aligorith/config/win64-vc-config.py	2009-06-02 01:40:53 UTC (rev 20571)
@@ -1,207 +1,205 @@
-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 = '3.0'
-BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
-BF_PYTHON_BINARY = 'python'
-BF_PYTHON_LIB = 'python30'
-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 = 'gettext'
-BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
-
-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

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list