sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

FTGL support for irix (I would like to say international and truetype

Browse Source 
text object support, but I can't test too much until Monday).
This commit is contained in:
Chris Want 2003-05-11 00:27:23 +00:00
parent b3c48c4d2c
commit fbca17dfa7
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/Makefile
View File

@ -140,9 +140,11 @@ PYPLAYERLIB ?= $(PYLIB)
ifeq ($(OS), windows) ifeq ($(OS), windows)
COMLIB += $(NAN_FREETYPE)/lib/freetype214ST.lib COMLIB += $(NAN_FREETYPE)/lib/freetype214ST.lib
else else
ifneq ($(OS), irix)
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
endif endif
endif endif
endif
ifeq ($(INTERNATIONAL), true) ifeq ($(INTERNATIONAL), true)
COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
ifeq ($(OS), windows) ifeq ($(OS), windows)
@ -159,8 +161,10 @@ ifeq ($(INTERNATIONAL), true)
endif endif
else else
COMLIB += $(NAN_FTGL)/lib/libftgl.a COMLIB += $(NAN_FTGL)/lib/libftgl.a
ifneq ($(OS), irix)
COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
endif endif
endif
ifeq ($(OS), darwin) ifeq ($(OS), darwin)
COMLIB += $(NAN_GETTEXT)/lib/libintl.a COMLIB += $(NAN_GETTEXT)/lib/libintl.a
endif endif

8
source/nan_definitions.mk
View File

@ -226,8 +226,8 @@ all debug::
export NAN_MESA ?= /usr/src/Mesa-3.1 export NAN_MESA ?= /usr/src/Mesa-3.1
export NAN_ZLIB ?= /usr/freeware export NAN_ZLIB ?= /usr/freeware
export NAN_NSPR ?= /usr/local/apps/openblender/nspr/target/dist export NAN_NSPR ?= /usr/local/apps/openblender/nspr/target/dist
export NAN_FREETYPE ?= $(LCGDIR)/freetype export NAN_FREETYPE ?= /usr/freeware
export NAN_GETTEXT ?= $(LCGDIR)/gettext export NAN_GETTEXT ?= /usr/freeware
# Uncomment the following line to use Mozilla inplace of netscape # Uncomment the following line to use Mozilla inplace of netscape
# CPPFLAGS +=-DMOZ_NOT_NET # CPPFLAGS +=-DMOZ_NOT_NET
@ -242,10 +242,10 @@ all debug::
export NAN_PARANOID ?= true export NAN_PARANOID ?= true
# enable l10n # enable l10n
#export INTERNATIONAL ?= true export INTERNATIONAL ?= true
# enable freetype2 support for text objects # enable freetype2 support for text objects
#export WITH_FREETYPE2 ?= true export WITH_FREETYPE2 ?= true
else else
ifeq ($(OS),linux) ifeq ($(OS),linux)

4
source/nan_link.mk
View File

@ -80,6 +80,10 @@ endif
ifeq ($(OS),irix) ifeq ($(OS),irix)
LLIBS = -lmovieGL -lGLU -lGL -lXmu -lXext -lX11 -lc -lm -ldmedia LLIBS = -lmovieGL -lGLU -lGL -lXmu -lXext -lX11 -lc -lm -ldmedia
LLIBS += -lcl -laudio -ldb -lCio -lz -woff 84,171 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) DYNLDFLAGS = -shared $(LDFLAGS)
endif endif