enable truetype fonts for text objects when building with the original
Makefiles. Platform manages should check nan_definitions.mk and set INTERNATIONAL to true for their platforms.
This commit is contained in:
Stefan Gartner
parent
1ecddea462
commit
b3c48c4d2c
@ -136,6 +136,13 @@ PYPLAYERLIB ?= $(PYLIB)
|
||||
ifeq ($(WITH_QUICKTIME), true)
|
||||
COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a
|
||||
endif
|
||||
ifeq ($(WITH_FREETYPE2), true)
|
||||
ifeq ($(OS), windows)
|
||||
COMLIB += $(NAN_FREETYPE)/lib/freetype214ST.lib
|
||||
else
|
||||
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
|
||||
endif
|
||||
endif
|
||||
ifeq ($(INTERNATIONAL), true)
|
||||
COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
|
||||
ifeq ($(OS), windows)
|
||||
|
||||
@ -58,8 +58,6 @@ CPPFLAGS += -I../../bpython/include
|
||||
CPPFLAGS += -I../../avi
|
||||
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
||||
|
||||
CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
|
||||
|
||||
# we still refer to /include a bit...
|
||||
CPPFLAGS += -I../../include
|
||||
|
||||
@ -74,3 +72,8 @@ CPPFLAGS += -I$(NAN_IKSOLVER)/include
|
||||
# path to our own external headerfiles
|
||||
CPPFLAGS += -I..
|
||||
|
||||
ifdef WITH_FREETYPE2
|
||||
CPPFLAGS += -DWITH_FREETYPE2
|
||||
CPPFLAGS += -I$(NAN_FREETYPE)/include
|
||||
CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
|
||||
endif
|
||||
|
||||
@ -63,7 +63,6 @@ typedef struct VFontData {
|
||||
BLI_vfontdata_from_psfont(
|
||||
struct PackedFile *pf);
|
||||
|
||||
#ifdef WITH_FREETYPE2
|
||||
/**
|
||||
* Construct a new VFontData structure from
|
||||
* Freetype font data in a PackedFile.
|
||||
@ -77,5 +76,3 @@ BLI_vfontdata_from_freetypefont(
|
||||
struct PackedFile *pf);
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -49,5 +49,10 @@ 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
|
||||
CPPFLAGS += -I../../include/
|
||||
|
||||
ifdef WITH_FREETYPE2
|
||||
CPPFLAGS += -DWITH_FREETYPE2
|
||||
endif
|
||||
|
||||
@ -114,6 +114,12 @@ all debug::
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
export NAN_PARANOID ?= true
|
||||
|
||||
# l10n
|
||||
#export INTERNATIONAL ?= true
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
#export WITH_FREETYPE2 ?= true
|
||||
|
||||
else
|
||||
ifeq ($(OS),darwin)
|
||||
|
||||
@ -156,6 +162,9 @@ all debug::
|
||||
# enable l10n
|
||||
export INTERNATIONAL ?= true
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
export WITH_FREETYPE2 ?= true
|
||||
|
||||
else
|
||||
ifeq ($(OS),freebsd)
|
||||
|
||||
@ -179,7 +188,6 @@ all debug::
|
||||
export NAN_FREETYPE ?= $(LCGDIR)/freetype
|
||||
export NAN_GETTEXT ?= $(LCGDIR)/gettext
|
||||
|
||||
|
||||
# Uncomment the following line to use Mozilla inplace of netscape
|
||||
# CPPFLAGS +=-DMOZ_NOT_NET
|
||||
# Location of MOZILLA/Netscape header files...
|
||||
@ -192,6 +200,12 @@ all debug::
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
export NAN_PARANOID ?= true
|
||||
|
||||
# enable l10n
|
||||
export INTERNATIONAL ?= true
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
export WITH_FREETYPE2 ?= true
|
||||
|
||||
else
|
||||
ifeq ($(OS),irix)
|
||||
|
||||
@ -227,6 +241,12 @@ all debug::
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
export NAN_PARANOID ?= true
|
||||
|
||||
# enable l10n
|
||||
#export INTERNATIONAL ?= true
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
#export WITH_FREETYPE2 ?= true
|
||||
|
||||
else
|
||||
ifeq ($(OS),linux)
|
||||
|
||||
@ -262,9 +282,13 @@ all debug::
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
export NAN_PARANOID ?= true
|
||||
|
||||
#i10n
|
||||
# l10n
|
||||
#export INTERNATIONAL ?= true
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
#export WITH_FREETYPE2 ?= true
|
||||
|
||||
|
||||
else
|
||||
ifeq ($(OS),openbsd)
|
||||
|
||||
@ -301,6 +325,12 @@ all debug::
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
export NAN_PARANOID ?= true
|
||||
|
||||
# l10n
|
||||
#export INTERNATIONAL ?= true
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
#export WITH_FREETYPE2 ?= true
|
||||
|
||||
else
|
||||
ifeq ($(OS),solaris)
|
||||
|
||||
@ -336,6 +366,12 @@ all debug::
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
export NAN_PARANOID ?= true
|
||||
|
||||
# l10n
|
||||
#export INTERNATIONAL ?= true
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
#export WITH_FREETYPE2 ?= true
|
||||
|
||||
else
|
||||
ifeq ($(OS),windows)
|
||||
|
||||
@ -372,6 +408,12 @@ all debug::
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
export NAN_PARANOID ?= true
|
||||
|
||||
# l10n
|
||||
#export INTERNATIONAL ?= true
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
#export WITH_FREETYPE2 ?= true
|
||||
|
||||
else # Platform not listed above
|
||||
|
||||
export NAN_PYTHON ?= $(LCGDIR)/python
|
||||
@ -404,6 +446,12 @@ all debug::
|
||||
export NAN_BUILDINFO ?= true
|
||||
# Be paranoid regarding library creation (do not update archives)
|
||||
export NAN_PARANOID ?= true
|
||||
|
||||
# l10n
|
||||
#export INTERNATIONAL ?= true
|
||||
|
||||
# enable freetype2 support for text objects
|
||||
#export WITH_FREETYPE2 ?= true
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
@ -37,11 +37,6 @@ ifdef NAN_DEBUG
|
||||
LDFLAGS += $(NAN_DEBUG)
|
||||
endif
|
||||
|
||||
ifdef WITH_FREETYPE2
|
||||
LDFLAGS += -L$(NAN_FREETYPE)/lib -lfreetype
|
||||
endif
|
||||
|
||||
|
||||
DBG_LDFLAGS += -g
|
||||
|
||||
ifneq (x$(DEBUG_DIR), x)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user