From 769d724d8369497e465871c074fdd90dbc9637fe Mon Sep 17 00:00:00 2001 From: Chris Want Date: Tue, 13 May 2003 03:30:26 +0000 Subject: [PATCH] Static linking of freetype, libintl from sgi freeware for irix and made WITH_FREETYPE2 independent of INTERNATIONAL (please test). --- source/Makefile | 9 +++++++-- source/nan_link.mk | 4 ---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/source/Makefile b/source/Makefile index 66812ac648b..ea6b9b54bd5 100644 --- a/source/Makefile +++ b/source/Makefile @@ -140,7 +140,9 @@ PYPLAYERLIB ?= $(PYLIB) ifeq ($(OS), windows) COMLIB += $(NAN_FREETYPE)/lib/freetype2ST.lib else - ifneq ($(OS), irix) + ifeq ($(OS), irix) + COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a + else COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a endif endif @@ -161,7 +163,10 @@ ifeq ($(INTERNATIONAL), true) endif else COMLIB += $(NAN_FTGL)/lib/libftgl.a - ifneq ($(OS), irix) + ifeq ($(OS), irix) + COMLIB += $(NAN_FREETYPE)/lib32/libfreetype.a + COMLIB += $(NAN_FREETYPE)/lib32/libintl.a + else COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a endif endif diff --git a/source/nan_link.mk b/source/nan_link.mk index 1513a8cc0ab..1006bf6d9dd 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -80,10 +80,6 @@ endif ifeq ($(OS),irix) LLIBS = -lmovieGL -lGLU -lGL -lXmu -lXext -lX11 -lc -lm -ldmedia LLIBS += -lcl -laudio -ldb -lCio -lz -woff 84,171 - ifeq ($(INTERNATIONAL), true) - LLIBS += -L$(NAN_FREETYPE)/lib32 -lfreetype - LLIBS += -L$(NAN_ICONV)/lib32 -lintl - endif DYNLDFLAGS = -shared $(LDFLAGS) endif