diff --git a/source/Makefile b/source/Makefile index e12c4baac4d..3bcd2f4aa2a 100644 --- a/source/Makefile +++ b/source/Makefile @@ -140,7 +140,9 @@ PYPLAYERLIB ?= $(PYLIB) ifeq ($(OS), windows) COMLIB += $(NAN_FREETYPE)/lib/freetype214ST.lib else - COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a + ifneq ($(OS), irix) + COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a + endif endif endif ifeq ($(INTERNATIONAL), true) @@ -159,7 +161,9 @@ ifeq ($(INTERNATIONAL), true) endif else COMLIB += $(NAN_FTGL)/lib/libftgl.a - COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a + ifneq ($(OS), irix) + COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a + endif endif ifeq ($(OS), darwin) COMLIB += $(NAN_GETTEXT)/lib/libintl.a diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk index 1b0da5f8ffe..6426e974f6a 100644 --- a/source/nan_definitions.mk +++ b/source/nan_definitions.mk @@ -226,8 +226,8 @@ all debug:: export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_ZLIB ?= /usr/freeware export NAN_NSPR ?= /usr/local/apps/openblender/nspr/target/dist - export NAN_FREETYPE ?= $(LCGDIR)/freetype - export NAN_GETTEXT ?= $(LCGDIR)/gettext + export NAN_FREETYPE ?= /usr/freeware + export NAN_GETTEXT ?= /usr/freeware # Uncomment the following line to use Mozilla inplace of netscape # CPPFLAGS +=-DMOZ_NOT_NET @@ -242,10 +242,10 @@ all debug:: export NAN_PARANOID ?= true # enable l10n - #export INTERNATIONAL ?= true - + export INTERNATIONAL ?= true + # enable freetype2 support for text objects - #export WITH_FREETYPE2 ?= true + export WITH_FREETYPE2 ?= true else ifeq ($(OS),linux) diff --git a/source/nan_link.mk b/source/nan_link.mk index 1006bf6d9dd..1513a8cc0ab 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -80,6 +80,10 @@ 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