[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20073] branches/blender2.5/blender: Big, big commit!!
Diego Borghetti
bdiego at gmail.com
Wed May 6 01:10:32 CEST 2009
Revision: 20073
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20073
Author: bdiego
Date: 2009-05-06 01:10:32 +0200 (Wed, 06 May 2009)
Log Message:
-----------
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)
Modified Paths:
--------------
branches/blender2.5/blender/CMake/macros.cmake
branches/blender2.5/blender/CMakeLists.txt
branches/blender2.5/blender/INSTALL
branches/blender2.5/blender/SConstruct
branches/blender2.5/blender/blenderplayer/CMakeLists.txt
branches/blender2.5/blender/config/darwin-config.py
branches/blender2.5/blender/config/irix6-config.py
branches/blender2.5/blender/config/linux2-config.py
branches/blender2.5/blender/config/linuxcross-config.py
branches/blender2.5/blender/config/openbsd3-config.py
branches/blender2.5/blender/config/sunos5-config.py
branches/blender2.5/blender/config/win32-mingw-config.py
branches/blender2.5/blender/config/win32-vc-config.py
branches/blender2.5/blender/config/win64-vc-config.py
branches/blender2.5/blender/extern/Makefile
branches/blender2.5/blender/intern/CMakeLists.txt
branches/blender2.5/blender/intern/Makefile
branches/blender2.5/blender/intern/SConscript
branches/blender2.5/blender/intern/ghost/test/multitest/Makefile
branches/blender2.5/blender/make/example_scripts/linux_nanmakefiles.sh
branches/blender2.5/blender/make/example_scripts/sunos_nanmakefiles.sh
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/blenfont/BLF_api.h
branches/blender2.5/blender/source/blender/blenfont/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenfont/SConscript
branches/blender2.5/blender/source/blender/blenfont/intern/Makefile
branches/blender2.5/blender/source/blender/blenfont/intern/blf.c
branches/blender2.5/blender/source/blender/blenfont/intern/blf_dir.c
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font.c
branches/blender2.5/blender/source/blender/blenfont/intern/blf_glyph.c
branches/blender2.5/blender/source/blender/blenfont/intern/blf_internal.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_internal_types.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_util.c
branches/blender2.5/blender/source/blender/blenkernel/BKE_global.h
branches/blender2.5/blender/source/blender/blenkernel/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenkernel/SConscript
branches/blender2.5/blender/source/blender/blenkernel/intern/Makefile
branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
branches/blender2.5/blender/source/blender/blenkernel/intern/font.c
branches/blender2.5/blender/source/blender/blenkernel/intern/gpencil.c
branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
branches/blender2.5/blender/source/blender/blenlib/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenlib/SConscript
branches/blender2.5/blender/source/blender/blenlib/intern/Makefile
branches/blender2.5/blender/source/blender/blenlib/intern/freetypefont.c
branches/blender2.5/blender/source/blender/editors/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/armature/Makefile
branches/blender2.5/blender/source/blender/editors/armature/SConscript
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/armature/reeb.c
branches/blender2.5/blender/source/blender/editors/curve/Makefile
branches/blender2.5/blender/source/blender/editors/curve/SConscript
branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
branches/blender2.5/blender/source/blender/editors/gpencil/Makefile
branches/blender2.5/blender/source/blender/editors/gpencil/SConscript
branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_edit.c
branches/blender2.5/blender/source/blender/editors/interface/Makefile
branches/blender2.5/blender/source/blender/editors/interface/SConscript
branches/blender2.5/blender/source/blender/editors/interface/interface_style.c
branches/blender2.5/blender/source/blender/editors/interface/view2d.c
branches/blender2.5/blender/source/blender/editors/mesh/Makefile
branches/blender2.5/blender/source/blender/editors/mesh/SConscript
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/object/Makefile
branches/blender2.5/blender/source/blender/editors/object/SConscript
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/physics/Makefile
branches/blender2.5/blender/source/blender/editors/physics/SConscript
branches/blender2.5/blender/source/blender/editors/preview/Makefile
branches/blender2.5/blender/source/blender/editors/preview/SConscript
branches/blender2.5/blender/source/blender/editors/screen/CMakeLists.txt
branches/blender2.5/blender/source/blender/editors/screen/Makefile
branches/blender2.5/blender/source/blender/editors/screen/SConscript
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/sculpt_paint/Makefile
branches/blender2.5/blender/source/blender/editors/sculpt_paint/SConscript
branches/blender2.5/blender/source/blender/editors/space_file/Makefile
branches/blender2.5/blender/source/blender/editors/space_file/SConscript
branches/blender2.5/blender/source/blender/editors/space_file/file_draw.c
branches/blender2.5/blender/source/blender/editors/space_node/Makefile
branches/blender2.5/blender/source/blender/editors/space_node/SConscript
branches/blender2.5/blender/source/blender/editors/space_node/drawnode.c
branches/blender2.5/blender/source/blender/editors/space_node/node_draw.c
branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/Makefile
branches/blender2.5/blender/source/blender/editors/space_sequencer/SConscript
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/blender2.5/blender/source/blender/editors/space_text/SConscript
branches/blender2.5/blender/source/blender/editors/space_text/text_intern.h
branches/blender2.5/blender/source/blender/editors/space_view3d/Makefile
branches/blender2.5/blender/source/blender/editors/space_view3d/SConscript
branches/blender2.5/blender/source/blender/editors/space_view3d/drawarmature.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/transform/Makefile
branches/blender2.5/blender/source/blender/editors/transform/SConscript
branches/blender2.5/blender/source/blender/nodes/CMakeLists.txt
branches/blender2.5/blender/source/blender/nodes/SConscript
branches/blender2.5/blender/source/blender/python/CMakeLists.txt
branches/blender2.5/blender/source/blender/python/intern/Makefile
branches/blender2.5/blender/source/blender/windowmanager/CMakeLists.txt
branches/blender2.5/blender/source/blender/windowmanager/SConscript
branches/blender2.5/blender/source/blender/windowmanager/intern/Makefile
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/blender2.5/blender/source/creator/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile
branches/blender2.5/blender/source/gameengine/BlenderRoutines/SConscript
branches/blender2.5/blender/source/gameengine/Converter/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Converter/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/blender2.5/blender/source/gameengine/GamePlayer/common/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/common/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/common/unix/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/common/windows/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/Makefile
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/SConscript
branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/Makefile
branches/blender2.5/blender/source/gameengine/Ketsji/CMakeLists.txt
branches/blender2.5/blender/source/gameengine/Ketsji/SConscript
branches/blender2.5/blender/source/nan_definitions.mk
branches/blender2.5/blender/tools/Blender.py
branches/blender2.5/blender/tools/btools.py
Removed Paths:
-------------
branches/blender2.5/blender/extern/bFTGL/
branches/blender2.5/blender/intern/bmfont/
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font_helv10.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font_helv12.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font_helvb10.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font_helvb12.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font_helvb8.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font_scr12.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font_scr14.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_font_scr15.h
branches/blender2.5/blender/source/blender/blenfont/intern/blf_internal.c
Modified: branches/blender2.5/blender/CMake/macros.cmake
===================================================================
--- branches/blender2.5/blender/CMake/macros.cmake 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/CMake/macros.cmake 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/CMakeLists.txt 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/INSTALL
===================================================================
--- branches/blender2.5/blender/INSTALL 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/INSTALL 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/SConstruct
===================================================================
--- branches/blender2.5/blender/SConstruct 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/SConstruct 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/blenderplayer/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/blenderplayer/CMakeLists.txt 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/config/darwin-config.py
===================================================================
--- branches/blender2.5/blender/config/darwin-config.py 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/config/darwin-config.py 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/config/irix6-config.py
===================================================================
--- branches/blender2.5/blender/config/irix6-config.py 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/config/irix6-config.py 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/config/linux2-config.py
===================================================================
--- branches/blender2.5/blender/config/linux2-config.py 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/config/linux2-config.py 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/config/linuxcross-config.py
===================================================================
--- branches/blender2.5/blender/config/linuxcross-config.py 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/config/linuxcross-config.py 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/config/openbsd3-config.py
===================================================================
--- branches/blender2.5/blender/config/openbsd3-config.py 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/config/openbsd3-config.py 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/config/sunos5-config.py
===================================================================
--- branches/blender2.5/blender/config/sunos5-config.py 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/config/sunos5-config.py 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/config/win32-mingw-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-mingw-config.py 2009-05-05 22:32:15 UTC (rev 20072)
+++ branches/blender2.5/blender/config/win32-mingw-config.py 2009-05-05 23:10:32 UTC (rev 20073)
@@ -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/blender2.5/blender/config/win32-vc-config.py
===================================================================
--- branches/blender2.5/blender/config/win32-vc-config.py 2009-05-05 22:32:15 UTC (rev 20072)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list