Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Want <cwant@ualberta.ca>2003-05-13 07:30:26 +0400
committerChris Want <cwant@ualberta.ca>2003-05-13 07:30:26 +0400
commit769d724d8369497e465871c074fdd90dbc9637fe (patch)
treea256899548502febb552f6a4060b700eda3efd1b /source/Makefile
parentb9f6d66328b8b96d4f1fe29f761a99fbe531c4de (diff)
Static linking of freetype, libintl from sgi freeware for irix
and made WITH_FREETYPE2 independent of INTERNATIONAL (please test).
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile9
1 files changed, 7 insertions, 2 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