forked from bartvdbraak/blender
Static linking of freetype, libintl from sgi freeware for irix
and made WITH_FREETYPE2 independent of INTERNATIONAL (please test).
This commit is contained in:
parent
b9f6d66328
commit
769d724d83
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user