Static linking of freetype, libintl from sgi freeware for irix
authorChris Want <cwant@ualberta.ca>
Tue, 13 May 2003 03:30:26 +0000 (03:30 +0000)
committerChris Want <cwant@ualberta.ca>
Tue, 13 May 2003 03:30:26 +0000 (03:30 +0000)
and made WITH_FREETYPE2 independent of INTERNATIONAL (please
test).

source/Makefile
source/nan_link.mk

index 66812ac648b2bef53986e657f3a8208a6e5fd33a..ea6b9b54bd5299ed364d3b3de7b4461efbd8a5d5 100644 (file)
@@ -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
index 1513a8cc0abf0ef9a69a1cb478568f6e7d2af279..1006bf6d9ddb2e16087c5bb8e726308bffd53b23 100644 (file)
@@ -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