archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

cygwin build now links with freetype2ST.lib

Browse Source
This commit is contained in:
Simon Clitherow
2003-05-11 18:17:00 +00:00
parent 2552f05b31
commit 92b017f3ce
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/Makefile
View File

@@ -138,7 +138,7 @@ PYPLAYERLIB ?= $(PYLIB)
endif
ifeq ($(WITH_FREETYPE2), true)
ifeq ($(OS), windows)
COMLIB += $(NAN_FREETYPE)/lib/freetype214ST.lib
COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
else
ifneq ($(OS), irix)
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
@@ -156,7 +156,7 @@ ifeq ($(INTERNATIONAL), true)
else
COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
COMLIB += $(NAN_FREETYPE)/lib/freetype214ST.lib
COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib
COMLIB += $(NAN_ICONV)/lib/iconv.lib
endif
else

7
source/nan_definitions.mk
View File

@@ -409,10 +409,13 @@ all debug::
export NAN_PARANOID ?= true
# l10n
#export INTERNATIONAL ?= true
export INTERNATIONAL ?= true
# enable freetype2 support for text objects
#export WITH_FREETYPE2 ?= true
export WITH_FREETYPE2 ?= true
# enable quicktime support
# export WITH_QUICKTIME ?= true
else # Platform not listed above