[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20128] branches/soc-2009-yukishiro: merge with HEAD again

Jingyuan Huang jingyuan.huang at gmail.com
Sun May 10 17:42:34 CEST 2009


Revision: 20128
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20128
Author:   yukishiro
Date:     2009-05-10 17:42:34 +0200 (Sun, 10 May 2009)

Log Message:
-----------
merge with HEAD again

Modified Paths:
--------------
    branches/soc-2009-yukishiro/CMake/macros.cmake
    branches/soc-2009-yukishiro/CMakeLists.txt
    branches/soc-2009-yukishiro/INSTALL
    branches/soc-2009-yukishiro/SConstruct
    branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt
    branches/soc-2009-yukishiro/config/darwin-config.py
    branches/soc-2009-yukishiro/config/irix6-config.py
    branches/soc-2009-yukishiro/config/linux2-config.py
    branches/soc-2009-yukishiro/config/linuxcross-config.py
    branches/soc-2009-yukishiro/config/openbsd3-config.py
    branches/soc-2009-yukishiro/config/sunos5-config.py
    branches/soc-2009-yukishiro/config/win32-mingw-config.py
    branches/soc-2009-yukishiro/config/win32-vc-config.py
    branches/soc-2009-yukishiro/config/win64-vc-config.py
    branches/soc-2009-yukishiro/extern/CMakeLists.txt
    branches/soc-2009-yukishiro/extern/Makefile
    branches/soc-2009-yukishiro/extern/SConscript
    branches/soc-2009-yukishiro/intern/CMakeLists.txt
    branches/soc-2009-yukishiro/intern/Makefile
    branches/soc-2009-yukishiro/intern/SConscript
    branches/soc-2009-yukishiro/intern/ghost/test/multitest/Makefile
    branches/soc-2009-yukishiro/make/example_scripts/linux_nanmakefiles.sh
    branches/soc-2009-yukishiro/make/example_scripts/sunos_nanmakefiles.sh
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/blender.sln
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenfont/BLF_blenfont.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/editors/ED_editors.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/makesrna/RNA_rna.vcproj
    branches/soc-2009-yukishiro/projectfiles_vc9/blender/nodes/nodes.vcproj
    branches/soc-2009-yukishiro/release/datafiles/blenderbuttons
    branches/soc-2009-yukishiro/release/ui/buttons_scene.py
    branches/soc-2009-yukishiro/release/ui/buttons_world.py
    branches/soc-2009-yukishiro/source/Makefile
    branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
    branches/soc-2009-yukishiro/source/blender/blenfont/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/blenfont/SConscript
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/Makefile
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf.c
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_dir.c
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font.c
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_glyph.c
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal_types.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_util.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_blender.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_global.h
    branches/soc-2009-yukishiro/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/blenkernel/SConscript
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/Makefile
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/blender.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/font.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2009-yukishiro/source/blender/blenkernel/intern/image.c
    branches/soc-2009-yukishiro/source/blender/blenlib/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/blenlib/SConscript
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/Makefile
    branches/soc-2009-yukishiro/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
    branches/soc-2009-yukishiro/source/blender/editors/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/editors/animation/anim_filter.c
    branches/soc-2009-yukishiro/source/blender/editors/animation/anim_markers.c
    branches/soc-2009-yukishiro/source/blender/editors/animation/keyframes_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/armature/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature.c
    branches/soc-2009-yukishiro/source/blender/editors/armature/reeb.c
    branches/soc-2009-yukishiro/source/blender/editors/curve/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/curve/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/curve/editcurve.c
    branches/soc-2009-yukishiro/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2009-yukishiro/source/blender/editors/gpencil/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/gpencil/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2009-yukishiro/source/blender/editors/gpencil/editaction_gpencil.c
    branches/soc-2009-yukishiro/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_anim_api.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_keyframes_edit.h
    branches/soc-2009-yukishiro/source/blender/editors/include/ED_markers.h
    branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
    branches/soc-2009-yukishiro/source/blender/editors/include/UI_resources.h
    branches/soc-2009-yukishiro/source/blender/editors/interface/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/interface/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_anim.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_panel.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_style.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_utils.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/resources.c
    branches/soc-2009-yukishiro/source/blender/editors/interface/view2d.c
    branches/soc-2009-yukishiro/source/blender/editors/mesh/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/mesh/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2009-yukishiro/source/blender/editors/object/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/object/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/physics/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/physics/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/preview/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/preview/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/screen/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/editors/screen/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/screen/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/screen/area.c
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/space_action/action_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/space_action/action_select.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/space_file/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/space_file/file_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_file/fsmenu.c
    branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_select.c
    branches/soc-2009-yukishiro/source/blender/editors/space_node/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/space_node/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/space_node/drawnode.c
    branches/soc-2009-yukishiro/source/blender/editors/space_node/node_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner.c
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_text/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/space_text/text_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2009-yukishiro/source/blender/editors/transform/Makefile
    branches/soc-2009-yukishiro/source/blender/editors/transform/SConscript
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform.h
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_generics.c
    branches/soc-2009-yukishiro/source/blender/editors/transform/transform_input.c
    branches/soc-2009-yukishiro/source/blender/editors/util/ed_util.c
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_anim_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2009-yukishiro/source/blender/makesdna/DNA_meshdata_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2009-yukishiro/source/blender/nodes/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/nodes/SConscript
    branches/soc-2009-yukishiro/source/blender/python/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/python/intern/Makefile
    branches/soc-2009-yukishiro/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2009-yukishiro/source/blender/windowmanager/SConscript
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/Makefile
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2009-yukishiro/source/creator/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/Makefile
    branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2009-yukishiro/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Converter/SConscript
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/GPC_RenderTools.h
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/Makefile
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/SConscript
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/unix/Makefile
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/common/windows/Makefile
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/Makefile
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2009-yukishiro/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2009-yukishiro/source/gameengine/Ketsji/SConscript
    branches/soc-2009-yukishiro/source/nan_definitions.mk
    branches/soc-2009-yukishiro/tools/Blender.py
    branches/soc-2009-yukishiro/tools/btools.py

Added Paths:
-----------
    branches/soc-2009-yukishiro/release/ui/buttons_data_camera.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_lattice.py
    branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
    branches/soc-2009-yukishiro/release/ui/buttons_material.py

Removed Paths:
-------------
    branches/soc-2009-yukishiro/extern/bFTGL/
    branches/soc-2009-yukishiro/intern/bmfont/
    branches/soc-2009-yukishiro/release/ui/buttons_data.py
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font_helv10.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font_helv12.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font_helvb10.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font_helvb12.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font_helvb8.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font_scr12.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font_scr14.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_font_scr15.h
    branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_internal.c

Modified: branches/soc-2009-yukishiro/CMake/macros.cmake
===================================================================
--- branches/soc-2009-yukishiro/CMake/macros.cmake	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/CMake/macros.cmake	2009-05-10 15:42:34 UTC (rev 20128)
@@ -43,9 +43,9 @@
     CMAKE_POLICY(SET CMP0003 NEW)
   endif(COMMAND cmake_policy)
   LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
+  LINK_DIRECTORIES(${FREETYPE_LIBPATH})
   IF(WITH_INTERNATIONAL)
     LINK_DIRECTORIES(${GETTEXT_LIBPATH})
-    LINK_DIRECTORIES(${FREETYPE_LIBPATH})
   ENDIF(WITH_INTERNATIONAL)
   IF(WITH_OPENAL)
     LINK_DIRECTORIES(${OPENAL_LIBPATH})
@@ -62,6 +62,7 @@
   TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LIB} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
 
   TARGET_LINK_LIBRARIES(${target} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${PYTHON_LINKFLAGS} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB} ${SDL_LIB} ${LLIBS})
+  TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
 
   # since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
 
@@ -78,7 +79,6 @@
   ENDIF(WIN32)
 
   IF(WITH_INTERNATIONAL)
-    TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB})
     TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB})
   ENDIF(WITH_INTERNATIONAL)
   IF(WITH_OPENAL)

Modified: branches/soc-2009-yukishiro/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/CMakeLists.txt	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/CMakeLists.txt	2009-05-10 15:42:34 UTC (rev 20128)
@@ -436,10 +436,6 @@
 #-----------------------------------------------------------------------------
 # Common.
 
-SET(FTGL ${CMAKE_SOURCE_DIR}/extern/bFTGL)
-SET(FTGL_INC ${FTGL}/include)
-SET(FTGL_LIB extern_ftgl)
-
 set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
 set(OPENJPEG_INC ${OPENJPEG})
 set(OPENJPEG_LIb extern_libopenjpeg)

Modified: branches/soc-2009-yukishiro/INSTALL
===================================================================
--- branches/soc-2009-yukishiro/INSTALL	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/INSTALL	2009-05-10 15:42:34 UTC (rev 20128)
@@ -32,41 +32,16 @@
 If you want to compile with QuickTime enabled, download the SDK for your OS:
 quicktime:   http://developer.apple.com/quicktime/
 
-For the translations to other languages than English you will need gettext,
-freetype2 and FTGL. Note that these translations are not complete yet, some
-time after the release of 2.27 they will be made available for download also.
+For the translations to other languages than English you will need gettext.
+Note that these translations are not complete yet, some time after the
+release of 2.27 they will be made available for download also.
 We welcome feedback about the translated user interface, and even contributions
 to the translation effort :)
 
 gettext:     http://www.gnu.org/software/gettext/
-freetype2:   http://www.freetype.org/
-FTGL:        http://homepages.paradise.net.nz/henryj/code/#FTGL
 
-FTGL needs a small patch to get glyphs with the right colour in the cache
---- FTGL/src/FTPixmapGlyph.cpp.orig	2003-05-10 16:07:45.000000000 +0200
-+++ FTGL/src/FTPixmapGlyph.cpp	2003-05-10 16:09:19.000000000 +0200
-@@ -33,3 +33,3 @@
-         // Get the current glColor.
-         float ftglColour[4];
--        glGetFloatv( GL_CURRENT_COLOR, ftglColour);
-+        ftglColour[0] = ftglColour[1] = ftglColour[2] = ftglColour[3] = 1.0;
 
 
-You may also need to modify the typedef for GLUTesselatorFunction in 
-src/FTVectoriser.cpp if you are on an undefined system.  To do that
-check the following link to find out various platform identifiers:
-http://www.blender3d.org/cms/Names.146.0.html#299
-
-_____________________________
-      ADDED FTGL NOTE:
-_____________________________
-
-ftgl now has been patched so much, that it's included in SVN/lib/
-The sources for the patched ftgl will be made available soon...
-
-
-
-
 *********************************************************************
 *********************************************************************
 
@@ -361,13 +336,7 @@
 * use ./configure then make and make install
 * the SVN version of freetype-config has the path on my computer, adjust it to yours if you want to rebuild fgtl
 
-FGTL
-* freetype must be already installed and working
-* build the unix version, not the mac one
-* set FT2_CONFIG var to the full path of freetype-config
-* configure with the following options --without-x  --with-ft-prefix=PFX --with-ft-exec-prefix=PFX where PFX is the valid path
 
-
 ----------------------NetBSD TIPS--------------------------------------
 NetBSD (and other platforms using pkgsrc)
 

Modified: branches/soc-2009-yukishiro/SConstruct
===================================================================
--- branches/soc-2009-yukishiro/SConstruct	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/SConstruct	2009-05-10 15:42:34 UTC (rev 20128)
@@ -281,7 +281,6 @@
 	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_FTGL'] = False
 	target_env_defs['WITH_BF_DDS'] = False
 	target_env_defs['WITH_BF_ZLIB'] = False
 	target_env_defs['WITH_BF_SDL'] = False

Modified: branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/blenderplayer/CMakeLists.txt	2009-05-10 15:42:34 UTC (rev 20128)
@@ -100,14 +100,11 @@
     extern_bullet 
     bf_guardedalloc 
     bf_memutil 
-    bf_bmfont 
     bf_blenlib 
     bf_cineon 
     bf_openexr 
     extern_libopenjpeg 
     bf_dds
-    bf_ftfont 
-    extern_ftgl 
     bf_readblenfile 
     blenkernel_blc
     bf_quicktime

Modified: branches/soc-2009-yukishiro/config/darwin-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/darwin-config.py	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/config/darwin-config.py	2009-05-10 15:42:34 UTC (rev 20128)
@@ -138,11 +138,6 @@
 BF_GETTEXT_LIB = 'intl'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE=True
 WITH_BF_PLAYER=True
 

Modified: branches/soc-2009-yukishiro/config/irix6-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/irix6-config.py	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/config/irix6-config.py	2009-05-10 15:42:34 UTC (rev 20128)
@@ -77,11 +77,6 @@
 BF_GETTEXT_LIB = 'gettextpo intl'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = 'true'
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE='false'
 
 WITH_BF_ODE = 'false'

Modified: branches/soc-2009-yukishiro/config/linux2-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linux2-config.py	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/config/linux2-config.py	2009-05-10 15:42:34 UTC (rev 20128)
@@ -71,11 +71,6 @@
 BF_GETTEXT_LIB = 'gettextlib'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE=False
 
 WITH_BF_ODE = False

Modified: branches/soc-2009-yukishiro/config/linuxcross-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linuxcross-config.py	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/config/linuxcross-config.py	2009-05-10 15:42:34 UTC (rev 20128)
@@ -74,11 +74,6 @@
 BF_GETTEXT_LIB = 'gnu_gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = LIBDIR + '/ftgl'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE = False
 
 WITH_BF_ODE = True

Modified: branches/soc-2009-yukishiro/config/openbsd3-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/openbsd3-config.py	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/config/openbsd3-config.py	2009-05-10 15:42:34 UTC (rev 20128)
@@ -59,11 +59,6 @@
 BF_GETTEXT_LIB = 'intl iconv'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE=False
 
 WITH_BF_ODE = False

Modified: branches/soc-2009-yukishiro/config/sunos5-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/sunos5-config.py	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/config/sunos5-config.py	2009-05-10 15:42:34 UTC (rev 20128)
@@ -67,11 +67,6 @@
 BF_GETTEXT_LIB = 'gettextlib'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = '#extern/bFTGL'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE=False
 
 WITH_BF_ODE = False

Modified: branches/soc-2009-yukishiro/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-mingw-config.py	2009-05-10 15:23:18 UTC (rev 20127)
+++ branches/soc-2009-yukishiro/config/win32-mingw-config.py	2009-05-10 15:42:34 UTC (rev 20128)
@@ -75,11 +75,6 @@
 BF_GETTEXT_LIB = 'gnu_gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
-WITH_BF_FTGL = True
-BF_FTGL = LIBDIR + '/ftgl'
-BF_FTGL_INC = '${BF_FTGL}/include'
-BF_FTGL_LIB = 'extern_ftgl'
-
 WITH_BF_GAMEENGINE = False
 
 WITH_BF_ODE = True

Modified: branches/soc-2009-yukishiro/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-vc-config.py	2009-05-10 15:23:18 UTC (rev 20127)

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list