Big, big commit!!
authorDiego Borghetti <bdiego@gmail.com>
Tue, 5 May 2009 23:10:32 +0000 (23:10 +0000)
committerDiego Borghetti <bdiego@gmail.com>
Tue, 5 May 2009 23:10:32 +0000 (23:10 +0000)
commit405cf80eb8dc2df8ae160aee70aef34052add24a
treef03cc27e95bdf91b25ea9d2a0dffb28ccef666be
parent71c38978e14ebf3522fe60fc239ad04f10ef30ab
Big, big commit!!

1) Remove WITH_FREETYPE2 from code, so now blender always need freetype2
2) Remove the old bmfont
3) Remove ftfont and bFTGL library
4) Implement a new BLF_draw_default function for place that still need/use
   the old BMF api.

I try to update both, scons and cmake, but I only can test with make, so
hope all work fine.

MSVC is broken, but I don't have Windows, things to search and fix are
any reference to WITH_FREETYPE2, FTGL and BMFONT (take in care that
blenkernel also have a BKE_bmfont.h, this don't have anything to do with bmfont).
        Always have to link/include the freetype2 library
        Remove any reference to libbmfont
        Remove any reference to libftfont
        Remove any reference to libbftgl (or libbFTGL)
233 files changed:
CMake/macros.cmake
CMakeLists.txt
SConstruct
blenderplayer/CMakeLists.txt
config/darwin-config.py
config/irix6-config.py
config/linux2-config.py
config/linuxcross-config.py
config/openbsd3-config.py
config/sunos5-config.py
config/win32-mingw-config.py
config/win32-vc-config.py
config/win64-vc-config.py
extern/Makefile
extern/bFTGL/CMakeLists.txt [deleted file]
extern/bFTGL/COPYING.txt [deleted file]
extern/bFTGL/README.txt [deleted file]
extern/bFTGL/SConscript [deleted file]
extern/bFTGL/cleanup [deleted file]
extern/bFTGL/include/FTBBox.h [deleted file]
extern/bFTGL/include/FTBitmapGlyph.h [deleted file]
extern/bFTGL/include/FTBufferGlyph.h [deleted file]
extern/bFTGL/include/FTCharToGlyphIndexMap.h [deleted file]
extern/bFTGL/include/FTCharmap.h [deleted file]
extern/bFTGL/include/FTContour.h [deleted file]
extern/bFTGL/include/FTExtrdGlyph.h [deleted file]
extern/bFTGL/include/FTFace.h [deleted file]
extern/bFTGL/include/FTFont.h [deleted file]
extern/bFTGL/include/FTGL.h [deleted file]
extern/bFTGL/include/FTGLBitmapFont.h [deleted file]
extern/bFTGL/include/FTGLBufferFont.h [deleted file]
extern/bFTGL/include/FTGLExtrdFont.h [deleted file]
extern/bFTGL/include/FTGLOutlineFont.h [deleted file]
extern/bFTGL/include/FTGLPixmapFont.h [deleted file]
extern/bFTGL/include/FTGLPolygonFont.h [deleted file]
extern/bFTGL/include/FTGLTextureFont.h [deleted file]
extern/bFTGL/include/FTGlyph.h [deleted file]
extern/bFTGL/include/FTGlyphContainer.h [deleted file]
extern/bFTGL/include/FTLibrary.h [deleted file]
extern/bFTGL/include/FTList.h [deleted file]
extern/bFTGL/include/FTOutlineGlyph.h [deleted file]
extern/bFTGL/include/FTPixmapGlyph.h [deleted file]
extern/bFTGL/include/FTPoint.h [deleted file]
extern/bFTGL/include/FTPolyGlyph.h [deleted file]
extern/bFTGL/include/FTSize.h [deleted file]
extern/bFTGL/include/FTTextureGlyph.h [deleted file]
extern/bFTGL/include/FTVector.h [deleted file]
extern/bFTGL/include/FTVectoriser.h [deleted file]
extern/bFTGL/license.txt [deleted file]
extern/bFTGL/make/msvc_7_0/ftgl_static_lib.vcproj [deleted file]
extern/bFTGL/make/msvc_9_0/ftgl_static_lib.vcproj [deleted file]
extern/bFTGL/src/FTBitmapGlyph.cpp [deleted file]
extern/bFTGL/src/FTBufferGlyph.cpp [deleted file]
extern/bFTGL/src/FTCharmap.cpp [deleted file]
extern/bFTGL/src/FTContour.cpp [deleted file]
extern/bFTGL/src/FTExtrdGlyph.cpp [deleted file]
extern/bFTGL/src/FTFace.cpp [deleted file]
extern/bFTGL/src/FTFont.cpp [deleted file]
extern/bFTGL/src/FTGLBitmapFont.cpp [deleted file]
extern/bFTGL/src/FTGLBufferFont.cpp [deleted file]
extern/bFTGL/src/FTGLExtrdFont.cpp [deleted file]
extern/bFTGL/src/FTGLOutlineFont.cpp [deleted file]
extern/bFTGL/src/FTGLPixmapFont.cpp [deleted file]
extern/bFTGL/src/FTGLPolygonFont.cpp [deleted file]
extern/bFTGL/src/FTGLTextureFont.cpp [deleted file]
extern/bFTGL/src/FTGlyph.cpp [deleted file]
extern/bFTGL/src/FTGlyphContainer.cpp [deleted file]
extern/bFTGL/src/FTLibrary.cpp [deleted file]
extern/bFTGL/src/FTOutlineGlyph.cpp [deleted file]
extern/bFTGL/src/FTPixmapGlyph.cpp [deleted file]
extern/bFTGL/src/FTPoint.cpp [deleted file]
extern/bFTGL/src/FTPolyGlyph.cpp [deleted file]
extern/bFTGL/src/FTSize.cpp [deleted file]
extern/bFTGL/src/FTTextureGlyph.cpp [deleted file]
extern/bFTGL/src/FTVectoriser.cpp [deleted file]
extern/bFTGL/src/Makefile [deleted file]
extern/bFTGL/win32_vcpp/README_WIN32.txt [deleted file]
extern/bFTGL/win32_vcpp/ftgl.dsw [deleted file]
extern/bFTGL/win32_vcpp/ftgl_dll/ftgl_dll.dsp [deleted file]
extern/bFTGL/win32_vcpp/ftgl_static_lib/ftgl_static_lib.dsp [deleted file]
extern/bFTGL/win32_vcpp/unit_tests/unit_tests.dsp [deleted file]
intern/CMakeLists.txt
intern/Makefile
intern/SConscript
intern/bmfont/BMF_Api.h [deleted file]
intern/bmfont/BMF_Fonts.h [deleted file]
intern/bmfont/BMF_Settings.h [deleted file]
intern/bmfont/CMakeLists.txt [deleted file]
intern/bmfont/Makefile [deleted file]
intern/bmfont/SConscript [deleted file]
intern/bmfont/intern/BDF2BMF.py [deleted file]
intern/bmfont/intern/BMF_Api.cpp [deleted file]
intern/bmfont/intern/BMF_BitmapFont.cpp [deleted file]
intern/bmfont/intern/BMF_BitmapFont.h [deleted file]
intern/bmfont/intern/BMF_FontData.h [deleted file]
intern/bmfont/intern/BMF_font_helv10.cpp [deleted file]
intern/bmfont/intern/BMF_font_helv12.cpp [deleted file]
intern/bmfont/intern/BMF_font_helvb10.cpp [deleted file]
intern/bmfont/intern/BMF_font_helvb12.cpp [deleted file]
intern/bmfont/intern/BMF_font_helvb14.cpp [deleted file]
intern/bmfont/intern/BMF_font_helvb8.cpp [deleted file]
intern/bmfont/intern/BMF_font_scr12.cpp [deleted file]
intern/bmfont/intern/BMF_font_scr14.cpp [deleted file]
intern/bmfont/intern/BMF_font_scr15.cpp [deleted file]
intern/bmfont/intern/Makefile [deleted file]
intern/bmfont/make/msvc_6_0/bmfont.dsp [deleted file]
intern/bmfont/make/msvc_6_0/bmfont.dsw [deleted file]
intern/bmfont/make/msvc_7_0/bmfont.sln [deleted file]
intern/bmfont/make/msvc_7_0/bmfont.vcproj [deleted file]
intern/bmfont/make/msvc_9_0/bmfont.vcproj [deleted file]
intern/bmfont/test/Makefile [deleted file]
intern/bmfont/test/make/msvc_6_0/BMF_Test.dsp [deleted file]
intern/bmfont/test/make/msvc_6_0/BMF_Test.dsw [deleted file]
intern/bmfont/test/simpletest/BMF_Test.cpp [deleted file]
intern/bmfont/test/simpletest/Makefile [deleted file]
intern/ghost/test/multitest/Makefile
source/Makefile
source/blender/blenfont/BLF_api.h
source/blender/blenfont/CMakeLists.txt
source/blender/blenfont/SConscript
source/blender/blenfont/intern/Makefile
source/blender/blenfont/intern/blf.c
source/blender/blenfont/intern/blf_dir.c
source/blender/blenfont/intern/blf_font.c
source/blender/blenfont/intern/blf_font_helv10.h [deleted file]
source/blender/blenfont/intern/blf_font_helv12.h [deleted file]
source/blender/blenfont/intern/blf_font_helvb10.h [deleted file]
source/blender/blenfont/intern/blf_font_helvb12.h [deleted file]
source/blender/blenfont/intern/blf_font_helvb8.h [deleted file]
source/blender/blenfont/intern/blf_font_scr12.h [deleted file]
source/blender/blenfont/intern/blf_font_scr14.h [deleted file]
source/blender/blenfont/intern/blf_font_scr15.h [deleted file]
source/blender/blenfont/intern/blf_glyph.c
source/blender/blenfont/intern/blf_internal.c [deleted file]
source/blender/blenfont/intern/blf_internal.h
source/blender/blenfont/intern/blf_internal_types.h
source/blender/blenfont/intern/blf_util.c
source/blender/blenkernel/BKE_global.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/SConscript
source/blender/blenkernel/intern/Makefile
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/font.c
source/blender/blenkernel/intern/gpencil.c
source/blender/blenkernel/intern/image.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenlib/SConscript
source/blender/blenlib/intern/Makefile
source/blender/blenlib/intern/freetypefont.c
source/blender/editors/CMakeLists.txt
source/blender/editors/armature/Makefile
source/blender/editors/armature/SConscript
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/reeb.c
source/blender/editors/curve/Makefile
source/blender/editors/curve/SConscript
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/Makefile
source/blender/editors/gpencil/SConscript
source/blender/editors/gpencil/drawgpencil.c
source/blender/editors/gpencil/editaction_gpencil.c
source/blender/editors/gpencil/gpencil_edit.c
source/blender/editors/interface/Makefile
source/blender/editors/interface/SConscript
source/blender/editors/interface/interface_style.c
source/blender/editors/interface/view2d.c
source/blender/editors/mesh/Makefile
source/blender/editors/mesh/SConscript
source/blender/editors/mesh/editmesh_tools.c
source/blender/editors/object/Makefile
source/blender/editors/object/SConscript
source/blender/editors/object/object_edit.c
source/blender/editors/physics/Makefile
source/blender/editors/physics/SConscript
source/blender/editors/preview/Makefile
source/blender/editors/preview/SConscript
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/screen/Makefile
source/blender/editors/screen/SConscript
source/blender/editors/screen/area.c
source/blender/editors/sculpt_paint/Makefile
source/blender/editors/sculpt_paint/SConscript
source/blender/editors/space_file/Makefile
source/blender/editors/space_file/SConscript
source/blender/editors/space_file/file_draw.c
source/blender/editors/space_node/Makefile
source/blender/editors/space_node/SConscript
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_sequencer/Makefile
source/blender/editors/space_sequencer/SConscript
source/blender/editors/space_sequencer/sequencer_draw.c
source/blender/editors/space_text/SConscript
source/blender/editors/space_text/text_intern.h
source/blender/editors/space_view3d/Makefile
source/blender/editors/space_view3d/SConscript
source/blender/editors/space_view3d/drawarmature.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/transform/Makefile
source/blender/editors/transform/SConscript
source/blender/nodes/CMakeLists.txt
source/blender/nodes/SConscript
source/blender/python/CMakeLists.txt
source/blender/python/intern/Makefile
source/blender/windowmanager/CMakeLists.txt
source/blender/windowmanager/SConscript
source/blender/windowmanager/intern/Makefile
source/blender/windowmanager/intern/wm_init_exit.c
source/creator/CMakeLists.txt
source/gameengine/BlenderRoutines/CMakeLists.txt
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
source/gameengine/BlenderRoutines/Makefile
source/gameengine/BlenderRoutines/SConscript
source/gameengine/Converter/CMakeLists.txt
source/gameengine/Converter/SConscript
source/gameengine/GamePlayer/common/CMakeLists.txt
source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
source/gameengine/GamePlayer/common/GPC_RenderTools.h
source/gameengine/GamePlayer/common/Makefile
source/gameengine/GamePlayer/common/SConscript
source/gameengine/GamePlayer/common/unix/Makefile
source/gameengine/GamePlayer/common/windows/Makefile
source/gameengine/GamePlayer/ghost/CMakeLists.txt
source/gameengine/GamePlayer/ghost/Makefile
source/gameengine/GamePlayer/ghost/SConscript
source/gameengine/Ketsji/CMakeLists.txt
source/gameengine/Ketsji/SConscript
source/nan_definitions.mk
tools/Blender.py
tools/btools.py