GLEW Patch #62 - stop linking to unneeded Xmu, Xi, Xext libraries

This commit is contained in:
Nigel Stewart 2014-02-19 18:21:33 -06:00
parent b19d0a09ed
commit d03b68e40d
12 changed files with 12 additions and 12 deletions

View File

@ -6,7 +6,7 @@ LD ?= $(CC)
LN := LN :=
LDFLAGS.EXTRA = LDFLAGS.EXTRA =
LIBDIR = $(GLEW_DEST)/lib LIBDIR = $(GLEW_DEST)/lib
LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic
WARN = -Wall -W WARN = -Wall -W

View File

@ -6,7 +6,7 @@ CFLAGS.EXTRA = -dynamic -fno-common
LDFLAGS.EXTRA = LDFLAGS.EXTRA =
ifneq (undefined, $(origin GLEW_APPLE_GLX)) ifneq (undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
else else
LDFLAGS.GL = -framework AGL -framework OpenGL LDFLAGS.GL = -framework AGL -framework OpenGL
endif endif

View File

@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch ppc -dynamic -fno-common
LDFLAGS.EXTRA = -arch ppc LDFLAGS.EXTRA = -arch ppc
ifneq (undefined, $(origin GLEW_APPLE_GLX)) ifneq (undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
else else
LDFLAGS.GL = -framework AGL -framework OpenGL LDFLAGS.GL = -framework AGL -framework OpenGL
endif endif

View File

@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch x86_64 -dynamic -fno-common
LDFLAGS.EXTRA = -arch x86_64 LDFLAGS.EXTRA = -arch x86_64
ifneq (undefined, $(origin GLEW_APPLE_GLX)) ifneq (undefined, $(origin GLEW_APPLE_GLX))
CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX' CFLAGS.EXTRA += -I/usr/X11R6/include -D'GLEW_APPLE_GLX'
LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -L/usr/X11R6/lib -lGL -lX11
else else
LDFLAGS.GL = -framework AGL -framework OpenGL LDFLAGS.GL = -framework AGL -framework OpenGL
endif endif

View File

@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
CC ?= cc CC ?= cc
LD ?= ld LD ?= ld
LDFLAGS.EXTRA = -L/usr/X11R6/lib LDFLAGS.EXTRA = -L/usr/X11R6/lib
LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic
CFLAGS.EXTRA += -I/usr/X11R6/include CFLAGS.EXTRA += -I/usr/X11R6/include

View File

@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
CC ?= cc CC ?= cc
LD ?= $(CC) LD ?= $(CC)
LDFLAGS.EXTRA = -L/usr/X11R6/lib LDFLAGS.EXTRA = -L/usr/X11R6/lib
LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic
NAME = GLEW NAME = GLEW

View File

@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
CC ?= cc CC ?= cc
LD ?= $(CC) LD ?= $(CC)
LDFLAGS.EXTRA = -L/usr/X11R6/lib LDFLAGS.EXTRA = -L/usr/X11R6/lib
LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic
NAME = GLEW NAME = GLEW

View File

@ -16,7 +16,7 @@ else
LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib
LIBDIR = $(GLEW_DEST)/lib LIBDIR = $(GLEW_DEST)/lib
endif endif
LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic
NAME = GLEW NAME = GLEW

View File

@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
CC ?= cc CC ?= cc
LD ?= ld LD ?= ld
LDFLAGS.EXTRA = -L/usr/X11R7/lib -R /usr/X11R7/lib LDFLAGS.EXTRA = -L/usr/X11R7/lib -R /usr/X11R7/lib
LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -lGL -lX11
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic
CFLAGS.EXTRA += -I/usr/X11R7/include -fPIC CFLAGS.EXTRA += -I/usr/X11R7/include -fPIC

View File

@ -2,7 +2,7 @@ NAME = $(GLEW_NAME)
CC ?= cc CC ?= cc
LD ?= ld LD ?= ld
LDFLAGS.EXTRA = -L/usr/X11R6/lib LDFLAGS.EXTRA = -L/usr/X11R6/lib
LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 -lm LDFLAGS.GL = -lGLU -lGL -lX11 -lm
LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.STATIC = -Wl,-Bstatic
LDFLAGS.DYNAMIC = -Wl,-Bdynamic LDFLAGS.DYNAMIC = -Wl,-Bdynamic
CFLAGS.EXTRA += -I/usr/X11R6/include CFLAGS.EXTRA += -I/usr/X11R6/include

View File

@ -4,7 +4,7 @@ LD ?= ld
CFLAGS.EXTRA = -I/usr/openwin/include CFLAGS.EXTRA = -I/usr/openwin/include
LDFLAGS.SO = -G LDFLAGS.SO = -G
LDFLAGS.EXTRA = -L/usr/openwin/lib LDFLAGS.EXTRA = -L/usr/openwin/lib
LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -lGL -lX11
NAME = GLEW NAME = GLEW
BIN.SUFFIX = BIN.SUFFIX =
POPT = -xO2 POPT = -xO2

View File

@ -4,7 +4,7 @@ LD ?= ld
CFLAGS.EXTRA = -I/usr/openwin/include CFLAGS.EXTRA = -I/usr/openwin/include
LDFLAGS.SO = -G LDFLAGS.SO = -G
LDFLAGS.EXTRA = -L/usr/openwin/lib LDFLAGS.EXTRA = -L/usr/openwin/lib
LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.GL = -lGL -lX11
NAME = GLEW NAME = GLEW
BIN.SUFFIX = BIN.SUFFIX =
POPT = -O2 POPT = -O2