changed rules to build demos on Solaris

VER-2-0-4-PATCH
David Turner 25 years ago
parent 62ccef7547
commit edfc0f8ac4
  1. 16
      demos/config/x11/rules.mk

@ -14,15 +14,17 @@
#
ifneq ($(findstring X11R6$(SEP)bin,$(PATH)),)
xversion := X11R6
endif
else
ifneq ($(findstring X11R5$(SEP)bin,$(PATH)),)
xversion := X11R5
endif
else
ifneq ($(findstring X11$(SEP)bin,$(PATH)),)
xversion := X11
endif
endif
endif
ifdef xversion
X11_PATH := $(subst ;, ,$(PATH)) $(subst :, ,$(PATH))
@ -47,10 +49,20 @@ X11_LIB := $(X11_PATH)$(SEP)lib
#
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
#
GRAPH_OBJS += $(OBJ_)grx11.$O
GR_X11 := config$(SEP)x11
GR_X11_ := $(GR_X11)$(SEP)

Loading…
Cancel
Save