From 92b017f3cea22dce6fea3187a0f6fb07befc795c Mon Sep 17 00:00:00 2001 From: Simon Clitherow Date: Sun, 11 May 2003 18:17:00 +0000 Subject: [PATCH] cygwin build now links with freetype2ST.lib --- source/Makefile | 4 ++-- source/nan_definitions.mk | 7 +++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/source/Makefile b/source/Makefile index 3bcd2f4aa2a..f67c1cfedaf 100644 --- a/source/Makefile +++ b/source/Makefile @@ -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 diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index f3d05918739..442660dd3f0 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -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