Diego Borghetti
405cf80eb8
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)
59 lines
1.6 KiB
Makefile
59 lines
1.6 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
# ***** BEGIN GPL LICENSE BLOCK *****
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
#
|
|
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
# All rights reserved.
|
|
#
|
|
# The Original Code is: all of this file.
|
|
#
|
|
# Contributor(s): none yet.
|
|
#
|
|
# ***** END GPL LICENSE BLOCK *****
|
|
#
|
|
#
|
|
|
|
LIBNAME = blenlib
|
|
DIR = $(OCGDIR)/blender/$(LIBNAME)
|
|
|
|
include nan_compile.mk
|
|
|
|
CFLAGS += $(LEVEL_1_C_WARNINGS)
|
|
|
|
# path to SDNA types
|
|
CPPFLAGS += -I../../makesdna
|
|
# path to our own external headerfiles
|
|
CPPFLAGS += -I..
|
|
# path to the guarded memory allocator
|
|
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
|
# path to freetype font stuff
|
|
CPPFLAGS += -I$(NAN_FREETYPE)/include
|
|
CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
|
|
# path to blenkernel
|
|
CPPFLAGS += -I$(SRCHOME)/blender/blenkernel
|
|
CPPFLAGS += -I../../editors/include/
|
|
# path to zlib
|
|
CPPFLAGS += -I$(NAN_ZLIB)/include
|
|
|
|
ifdef NAN_PTHREADS
|
|
CPPFLAGS += -I$(NAN_PTHREADS)/include
|
|
endif
|
|
ifeq ($(OS),linux)
|
|
CPPFLAGS += -I$(OCGDIR)/extern/binreloc/include
|
|
endif
|