diff --git a/glide3x/cvg/glide3/src/makefile.linux b/glide3x/cvg/glide3/src/makefile.linux index 8804f38..52bb6d9 100644 --- a/glide3x/cvg/glide3/src/makefile.linux +++ b/glide3x/cvg/glide3/src/makefile.linux @@ -245,7 +245,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_SO): $(GLIDE_OBJECTS:.o=.lo) $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB) ifeq ($(TEXUS2),1) - $(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lgld3x + $(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lglide3 -lm else $(warning Texus2 not enabled... Skipping $(TEXUS_EXE)) endif diff --git a/glide3x/h3/glide3/src/makefile.linux b/glide3x/h3/glide3/src/makefile.linux index df89286..64acb61 100644 --- a/glide3x/h3/glide3/src/makefile.linux +++ b/glide3x/h3/glide3/src/makefile.linux @@ -19,7 +19,7 @@ # DGA=1 Build DGA version (experimental). # default = no # XPATH specify X libraries path; needed by DRI and DGA. -# default = /usr/X11/lib +# default = /usr/X11R6/lib # H4=1 High speed Avenger. # default = no # CPU optimize for the given processor. @@ -79,7 +79,7 @@ CP = cp # platform CDEFS = -D__linux__ -XPATH ?= /usr/X11/lib +XPATH ?= /usr/X11R6/lib ifeq ($(DRI),1) CDEFS += -DDRI_BUILD LDFLAGS = -L$(XPATH) @@ -268,7 +268,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_SO): $(GLIDE_OBJECTS:.o=.lo) $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB) ifeq ($(TEXUS2),1) - $(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lgld3x + $(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lglide3 -lm else $(warning Texus2 not enabled... Skipping $(TEXUS_EXE)) endif diff --git a/glide3x/h3/glide3/tests/makefile.linux b/glide3x/h3/glide3/tests/makefile.linux index 83d032b..f1bc746 100644 --- a/glide3x/h3/glide3/tests/makefile.linux +++ b/glide3x/h3/glide3/tests/makefile.linux @@ -15,7 +15,7 @@ # DGA=1 Build DGA version (experimental). # default = no # XPATH specify X libraries path; needed by DGA. -# default = /usr/X11/lib +# default = /usr/X11R6/lib # CPU optimize for the given processor. # default = pentium # @@ -31,7 +31,7 @@ FX_GLIDE_HW = h3 TOP = ../../.. CPU ?= pentium -XPATH ?= /usr/X11/lib +XPATH ?= /usr/X11R6/lib CC = gcc CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU) diff --git a/glide3x/h5/glide3/src/makefile.linux b/glide3x/h5/glide3/src/makefile.linux index 7db8454..4270895 100644 --- a/glide3x/h5/glide3/src/makefile.linux +++ b/glide3x/h5/glide3/src/makefile.linux @@ -19,7 +19,7 @@ # DGA=1 Build DGA version (experimental). # default = no # XPATH specify X libraries path; needed by DRI and DGA. -# default = /usr/X11/lib +# default = /usr/X11R6/lib # H4=1 High speed Avenger/Napalm. # default = no # CPU optimize for the given processor. @@ -85,7 +85,7 @@ CP = cp # platform CDEFS = -D__linux__ -XPATH ?= /usr/X11/lib +XPATH ?= /usr/X11R6/lib ifeq ($(DRI),1) CDEFS += -DDRI_BUILD LDFLAGS = -L$(XPATH) @@ -297,7 +297,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_SO): $(GLIDE_OBJECTS:.o=.lo) $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB) ifeq ($(TEXUS2),1) - $(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lgld3x + $(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lglide3 -lm else $(warning Texus2 not enabled... Skipping $(TEXUS_EXE)) endif diff --git a/glide3x/h5/glide3/tests/makefile.linux b/glide3x/h5/glide3/tests/makefile.linux index 93630bc..6c7b8a3 100644 --- a/glide3x/h5/glide3/tests/makefile.linux +++ b/glide3x/h5/glide3/tests/makefile.linux @@ -15,7 +15,7 @@ # DGA=1 Build DGA version (experimental). # default = no # XPATH specify X libraries path; needed by DGA. -# default = /usr/X11/lib +# default = /usr/X11R6/lib # CPU optimize for the given processor. # default = pentium # @@ -31,7 +31,7 @@ FX_GLIDE_HW = h5 TOP = ../../.. CPU ?= pentium -XPATH ?= /usr/X11/lib +XPATH ?= /usr/X11R6/lib CC = gcc CFLAGS = -Wall -O2 -ffast-math -mcpu=$(CPU) diff --git a/glide3x/makefile.linux b/glide3x/makefile.linux index 8bdb22c..b4cf9f2 100644 --- a/glide3x/makefile.linux +++ b/glide3x/makefile.linux @@ -22,7 +22,7 @@ # default = no # XPATH specify X libraries path; needed by DRI and DGA. # target = h3, h5 -# default = /usr/X11/lib +# default = /usr/X11R6/lib # H4=1 High speed Avenger/Napalm. # target = h3, h5 # default = no diff --git a/glide3x/sst1/glide3/src/makefile.linux b/glide3x/sst1/glide3/src/makefile.linux index 21c7b59..25a54f4 100644 --- a/glide3x/sst1/glide3/src/makefile.linux +++ b/glide3x/sst1/glide3/src/makefile.linux @@ -245,7 +245,7 @@ $(GLIDE_LIBDIR)/$(GLIDE_SO): $(GLIDE_OBJECTS:.o=.lo) $(TEXUS_EXEDIR)/$(TEXUS_EXE): $(FX_GLIDE_SW)/texus2/cmd/cmd.c $(GLIDE_LIBDIR)/$(GLIDE_LIB) ifeq ($(TEXUS2),1) - $(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lgld3x + $(CC) -o $@ -s $(CFLAGS) -L$(GLIDE_LIBDIR) $< -lglide3 -lm else $(warning Texus2 not enabled... Skipping $(TEXUS_EXE)) endif