diff options
| author | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
|---|---|---|
| committer | Diego Borghetti <bdiego@gmail.com> | 2009-05-06 03:10:32 +0400 |
| commit | 405cf80eb8dc2df8ae160aee70aef34052add24a (patch) | |
| tree | f03cc27e95bdf91b25ea9d2a0dffb28ccef666be /CMake | |
| parent | 71c38978e14ebf3522fe60fc239ad04f10ef30ab (diff) | |
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)
Diffstat (limited to 'CMake')
| -rw-r--r-- | CMake/macros.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMake/macros.cmake b/CMake/macros.cmake index 145e344509e..df8e7515e67 100644 --- a/CMake/macros.cmake +++ b/CMake/macros.cmake @@ -43,9 +43,9 @@ MACRO(SETUP_LIBDIRS) 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 @@ MACRO(SETUP_LIBLINKS 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 @@ MACRO(SETUP_LIBLINKS ENDIF(WIN32) IF(WITH_INTERNATIONAL) - TARGET_LINK_LIBRARIES(${target} ${FREETYPE_LIB}) TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB}) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENAL) |