minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

changed rules to build demos on Solaris

This commit is contained in:
David Turner 2000-01-07 14:37:24 +00:00
parent 62ccef7547
commit edfc0f8ac4
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
demos/config/x11/rules.mk
View File

@ -14,15 +14,17 @@
# #
ifneq ($(findstring X11R6$(SEP)bin,$(PATH)),) ifneq ($(findstring X11R6$(SEP)bin,$(PATH)),)
xversion := X11R6 xversion := X11R6
endif else
ifneq ($(findstring X11R5$(SEP)bin,$(PATH)),) ifneq ($(findstring X11R5$(SEP)bin,$(PATH)),)
xversion := X11R5 xversion := X11R5
endif else
ifneq ($(findstring X11$(SEP)bin,$(PATH)),) ifneq ($(findstring X11$(SEP)bin,$(PATH)),)
xversion := X11 xversion := X11
endif endif
endif
endif
ifdef xversion ifdef xversion
X11_PATH := $(subst ;, ,$(PATH)) $(subst :, ,$(PATH)) X11_PATH := $(subst ;, ,$(PATH)) $(subst :, ,$(PATH))
@ -47,10 +49,20 @@ X11_LIB := $(X11_PATH)$(SEP)lib
# #
GRAPH_LINK += -L$(X11_LIB) -lX11 GRAPH_LINK += -L$(X11_LIB) -lX11
# Solaris needs a -lsocket in GRAPH_LINK ..
#
UNAME := $(shell uname)
ifneq ($(findstring $(UNAME),SunOS Solaris),)
GRAPH_LINK += -lsocket
endif
# add the X11 driver object file to the graphics library # add the X11 driver object file to the graphics library
# #
GRAPH_OBJS += $(OBJ_)grx11.$O GRAPH_OBJS += $(OBJ_)grx11.$O
GR_X11 := config$(SEP)x11 GR_X11 := config$(SEP)x11
GR_X11_ := $(GR_X11)$(SEP) GR_X11_ := $(GR_X11)$(SEP)