From 405cf80eb8dc2df8ae160aee70aef34052add24a Mon Sep 17 00:00:00 2001 From: Diego Borghetti Date: Tue, 5 May 2009 23:10:32 +0000 Subject: 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) --- CMakeLists.txt | 4 ---- 1 file changed, 4 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d11ea02aa4..f2bf65dfb57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -436,10 +436,6 @@ ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux") #----------------------------------------------------------------------------- # 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) -- cgit v1.2.3