chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

Makefile.linux updates for XPATH usage: add and use X11LIBS variable.

Browse Source
This commit is contained in:
sezero
2018-08-30 17:51:56 +03:00
parent 4a33160a11
commit fa2272350a
10 changed files with 49 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
glide2x/Makefile.linux
View File

@@ -16,9 +16,9 @@
# DRI=1 Build DRI version.
# target = h3
# default = no
# XPATH specify X libraries path; needed by DRI.
# target = h3
# default = /usr/X11R6/lib
# XPATH specify X11 path; needed by SST96 and H3.
# default = /usr/X11R6
# X11LIBS X libraries path; default = $(XPATH)/lib
# H4=1 High speed Avenger/Napalm.
# target = h3
# default = no

12
glide2x/h3/glide/src/Makefile.linux
View File

@@ -12,8 +12,9 @@
# Available options:
#
# Environment variables:
# XPATH specify X libraries path; needed by DRI.
# default = /usr/X11R6/lib
# XPATH specify X11 path.
# default = /usr/X11R6
# X11LIBS X libraries path; default = $(XPATH)/lib
# H4=1 High speed Avenger.
# default = no
# OPTFLAGS pass given optimization flags to compiler
@@ -72,9 +73,10 @@ CP = cp
# platform
CDEFS = -D__linux__
XPATH ?= /usr/X11R6/lib
LDFLAGS = -L$(XPATH)
LDLIBS = -lX11 -lXext -lXxf86dga -lXxf86vm
XPATH ?= /usr/X11R6
X11LIBS ?= $(XPATH)/lib
LDLIBS = -L$(X11LIBS) -lX11 -lXext -lXxf86dga -lXxf86vm
LDLIBS += -lm

5
glide2x/sst1/glide/src/Makefile.linux
View File

@@ -15,6 +15,7 @@
# default = sst1
# XPATH specify X11 path; needed for sst96.
# default = /usr/X11R6 (sst96 only)
# X11LIBS X libraries path; default = $(XPATH)/lib
# OPTFLAGS pass given optimization flags to compiler
# default = -O1 -ffast-math
# DEBUG=1 enable debugging checks and messages
@@ -68,10 +69,12 @@ CP = cp
# platform
CDEFS = -DINIT_LINUX
XPATH ?= /usr/X11R6
X11LIBS ?= $(XPATH)/lib
ifeq ($(FX_GLIDE_HW),sst96)
## NOTE: no -lXxf86rush in new X versions
LDLIBS = -L$(XPATH)/lib -lX11 -lXxf86dga -lXxf86rush -lXxf86vm
LDLIBS = -L$(X11LIBS) -lX11 -lXxf86dga -lXxf86rush -lXxf86vm
endif
LDLIBS += -lm

6
glide3x/Makefile.linux
View File

@@ -20,9 +20,9 @@
# DGA=1 Build DGA version (experimental).
# target = h3, h5
# default = no
# XPATH specify X libraries path; needed by DRI and DGA.
# target = h3, h5
# default = /usr/X11R6/lib
# XPATH specify X11 path; needed by SST96, and H3/H5 DRI and DGA.
# default = /usr/X11R6
# X11LIBS X libraries path; default = $(XPATH)/lib
# H4=1 High speed Avenger/Napalm.
# target = h3, h5
# default = no

17
glide3x/h3/glide3/src/Makefile.linux
View File

@@ -13,8 +13,9 @@
# default = no
# DGA=1 Build DGA version (experimental).
# default = no
# XPATH specify X libraries path; needed by DRI and DGA.
# default = /usr/X11R6/lib
# XPATH specify X11 path; needed by DRI and DGA.
# default = /usr/X11R6
# X11LIBS X libraries path; default = $(XPATH)/lib
# H4=1 High speed Avenger.
# default = no
# OPTFLAGS pass given optimization flags to compiler
@@ -78,22 +79,22 @@ CP = cp
# platform
CDEFS = -D__linux__
XPATH ?= /usr/X11R6/lib
XPATH ?= /usr/X11R6
X11LIBS ?= $(XPATH)/lib
ifeq ($(DRI),1)
CDEFS += -DDRI_BUILD
LDFLAGS = -L$(XPATH)
LDLIBS = -lX11
LDLIBS = -L$(X11LIBS) -lX11
endif
ifeq ($(DGA),1)
CDEFS += -DUSE_XDGA_SWITCH=1
LDFLAGS = -L$(XPATH)
LDLIBS = -lX11 -lXext -lXxf86dga
LDLIBS = -L$(X11LIBS) -lX11 -lXext -lXxf86dga
endif
LDLIBS += -lm
# general
CDEFS += -DGLIDE3 -DGLIDE3_ALPHA -DGLIDE_HW_TRI_SETUP=1 -DGLIDE_INIT_HWC -DGLIDE_PACKED_RGB=0 -DGLIDE_PACKET3_TRI_SETUP=1 -DGLIDE_TRI_CULLING=1 -DUSE_PACKET_FIFO=1
#CDEFS += -DGLIDE_CHECK_CONTEXT
LDLIBS += -lm
# subsystem
CDEFS += -DH3

6
glide3x/h3/glide3/tests/Makefile.linux
View File

@@ -11,8 +11,9 @@
# Environment variables:
# DGA=1 Build DGA version (experimental).
# default = no
# XPATH specify X1 path; needed by DGA.
# XPATH specify X11 path; needed by DGA.
# default = /usr/X11R6
# X11LIBS X libraries path; default = $(XPATH)/lib
# CPU optimize for the given processor.
# default = pentium
#
@@ -28,6 +29,7 @@ FX_GLIDE_HW = h3
TOP = ../../..
CPU ?= pentium
XPATH ?= /usr/X11R6
X11LIBS ?= $(XPATH)/lib
CC = gcc
CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
@@ -39,7 +41,7 @@ LDFLAGS = -s -L$(TOP)/$(FX_GLIDE_HW)/lib
LDLIBS = -lglide3
ifeq ($(DGA),1)
LDLIBS += -L$(XPATH)/lib -lX11 -lXext -lXxf86dga
LDLIBS += -L$(X11LIBS) -lX11 -lXext -lXxf86dga
endif
LDLIBS += -lm

17
glide3x/h5/glide3/src/Makefile.linux
View File

@@ -13,8 +13,9 @@
# default = no
# DGA=1 Build DGA version (experimental).
# default = no
# XPATH specify X libraries path; needed by DRI and DGA.
# default = /usr/X11R6/lib
# XPATH specify X11 path; needed by DRI and DGA.
# default = /usr/X11R6
# X11LIBS X libraries path; default = $(XPATH)/lib
# H4=1 High speed Avenger/Napalm.
# default = no
# OPTFLAGS pass given optimization flags to compiler
@@ -84,22 +85,22 @@ CP = cp
# platform
CDEFS = -D__linux__
XPATH ?= /usr/X11R6/lib
XPATH ?= /usr/X11R6
X11LIBS ?= $(XPATH)/lib
ifeq ($(DRI),1)
CDEFS += -DDRI_BUILD
LDFLAGS = -L$(XPATH)
LDLIBS = -lX11
LDLIBS = -L$(X11LIBS) -lX11
endif
ifeq ($(DGA),1)
CDEFS += -DUSE_XDGA_SWITCH=1
LDFLAGS = -L$(XPATH)
LDLIBS = -lX11 -lXext -lXxf86dga
LDLIBS = -L$(X11LIBS) -lX11 -lXext -lXxf86dga
endif
LDLIBS += -lm
# general
CDEFS += -DGLIDE3 -DGLIDE3_ALPHA -DGLIDE_HW_TRI_SETUP=1 -DGLIDE_INIT_HWC -DGLIDE_PACKED_RGB=0 -DGLIDE_PACKET3_TRI_SETUP=1 -DGLIDE_TRI_CULLING=1 -DUSE_PACKET_FIFO=1
#CDEFS += -DGLIDE_CHECK_CONTEXT
LDLIBS += -lm
# subsystem
CDEFS += -DH3

4
glide3x/h5/glide3/tests/Makefile.linux
View File

@@ -13,6 +13,7 @@
# default = no
# XPATH specify X11 path; needed by DGA.
# default = /usr/X11R6
# X11LIBS X libraries path; default = $(XPATH)/lib
# CPU optimize for the given processor.
# default = pentium
#
@@ -28,6 +29,7 @@ FX_GLIDE_HW = h5
TOP = ../../..
CPU ?= pentium
XPATH ?= /usr/X11R6
X11LIBS ?= $(XPATH)/lib
CC = gcc
CFLAGS = -Wall -O2 -ffast-math -mtune=$(CPU)
@@ -40,7 +42,7 @@ LDFLAGS = -s -L$(TOP)/$(FX_GLIDE_HW)/lib
LDLIBS = -lglide3
ifeq ($(DGA),1)
LDLIBS += -L$(XPATH)/lib -lX11 -lXext -lXxf86dga
LDLIBS += -L$(X11LIBS) -lX11 -lXext -lXxf86dga
endif
LDLIBS += -lm

5
glide3x/sst1/glide3/src/Makefile.linux
View File

@@ -13,6 +13,7 @@
# default = sst1
# XPATH specify X11 path; needed for sst96.
# default = /usr/X11R6 (sst96 only)
# X11LIBS X libraries path; default = $(XPATH)/lib
# OPTFLAGS pass given optimization flags to compiler
# default = -O1 -ffast-math
# DEBUG=1 enable debugging checks and messages
@@ -71,10 +72,12 @@ CP = cp
# platform
CDEFS = -DINIT_LINUX
XPATH ?= /usr/X11R6
X11LIBS ?= $(XPATH)/lib
ifeq ($(FX_GLIDE_HW),sst96)
## NOTE: no -lXxf86rush in new X versions
LDLIBS = -L$(XPATH)/lib -lX11 -lXxf86dga -lXxf86rush -lXxf86vm
LDLIBS = -L$(X11LIBS) -lX11 -lXxf86dga -lXxf86rush -lXxf86vm
endif
LDLIBS += -lm

4
glide3x/sst1/glide3/tests/Makefile.linux
View File

@@ -15,6 +15,7 @@
# default = pentium
# XPATH specify X11 path; needed for sst96.
# default = /usr/X11R6 (sst96 only)
# X11LIBS X libraries path; default = $(XPATH)/lib
#
# Targets:
# <file.exe> build a specific file
@@ -27,6 +28,7 @@
FX_GLIDE_HW ?= sst1
XPATH ?= /usr/X11R6
X11LIBS ?= $(XPATH)/lib
ifeq ($(FX_GLIDE_HW),sst1)
HWDEF = -DSST1
endif
@@ -48,7 +50,7 @@ LDFLAGS = -s -L$(TOP)/$(FX_HW_BASE)/lib/$(FX_GLIDE_HW)
LDLIBS = -lglide3x
ifeq ($(FX_GLIDE_HW),sst96)
LDLIBS += -L$(XPATH)/lib -lXxf86dga -lXxf86rush -lXxf86vm
LDLIBS += -L$(X11LIBS) -lXxf86dga -lXxf86rush -lXxf86vm
endif
LDLIBS += -lm