diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin index c715f62..258d235 100644 --- a/config/Makefile.cygwin +++ b/config/Makefile.cygwin @@ -6,7 +6,7 @@ LD ?= $(CC) LN := LDFLAGS.EXTRA = LIBDIR = $(GLEW_DEST)/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic WARN = -Wall -W diff --git a/config/Makefile.darwin b/config/Makefile.darwin index 87941ff..5751509 100644 --- a/config/Makefile.darwin +++ b/config/Makefile.darwin @@ -6,7 +6,7 @@ CFLAGS.EXTRA = -dynamic -fno-common LDFLAGS.EXTRA = ifneq (undefined, $(origin 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 LDFLAGS.GL = -framework AGL -framework OpenGL endif diff --git a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc index c5a57db..8199c70 100644 --- a/config/Makefile.darwin-ppc +++ b/config/Makefile.darwin-ppc @@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch ppc -dynamic -fno-common LDFLAGS.EXTRA = -arch ppc ifneq (undefined, $(origin 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 LDFLAGS.GL = -framework AGL -framework OpenGL endif diff --git a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64 index 4944f7a..d62b7f3 100644 --- a/config/Makefile.darwin-x86_64 +++ b/config/Makefile.darwin-x86_64 @@ -6,7 +6,7 @@ CFLAGS.EXTRA = -arch x86_64 -dynamic -fno-common LDFLAGS.EXTRA = -arch x86_64 ifneq (undefined, $(origin 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 LDFLAGS.GL = -framework AGL -framework OpenGL endif diff --git a/config/Makefile.freebsd b/config/Makefile.freebsd index 3973bdd..262f430 100644 --- a/config/Makefile.freebsd +++ b/config/Makefile.freebsd @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC ?= cc LD ?= ld LDFLAGS.EXTRA = -L/usr/X11R6/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic CFLAGS.EXTRA += -I/usr/X11R6/include diff --git a/config/Makefile.gnu b/config/Makefile.gnu index 332952e..dc8e32c 100644 --- a/config/Makefile.gnu +++ b/config/Makefile.gnu @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC ?= cc LD ?= $(CC) LDFLAGS.EXTRA = -L/usr/X11R6/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd index a13a6ea..21e330e 100644 --- a/config/Makefile.kfreebsd +++ b/config/Makefile.kfreebsd @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC ?= cc LD ?= $(CC) LDFLAGS.EXTRA = -L/usr/X11R6/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW diff --git a/config/Makefile.linux b/config/Makefile.linux index 96ab7c6..7b43ad3 100644 --- a/config/Makefile.linux +++ b/config/Makefile.linux @@ -16,7 +16,7 @@ else LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib LIBDIR = $(GLEW_DEST)/lib endif -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW diff --git a/config/Makefile.netbsd b/config/Makefile.netbsd index a781c2a..43691c2 100644 --- a/config/Makefile.netbsd +++ b/config/Makefile.netbsd @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC ?= cc LD ?= ld 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.DYNAMIC = -Wl,-Bdynamic CFLAGS.EXTRA += -I/usr/X11R7/include -fPIC diff --git a/config/Makefile.openbsd b/config/Makefile.openbsd index bd61960..78008b0 100644 --- a/config/Makefile.openbsd +++ b/config/Makefile.openbsd @@ -2,7 +2,7 @@ NAME = $(GLEW_NAME) CC ?= cc LD ?= ld 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.DYNAMIC = -Wl,-Bdynamic CFLAGS.EXTRA += -I/usr/X11R6/include diff --git a/config/Makefile.solaris b/config/Makefile.solaris index b435798..27cdda9 100644 --- a/config/Makefile.solaris +++ b/config/Makefile.solaris @@ -4,7 +4,7 @@ LD ?= ld CFLAGS.EXTRA = -I/usr/openwin/include LDFLAGS.SO = -G LDFLAGS.EXTRA = -L/usr/openwin/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 NAME = GLEW BIN.SUFFIX = POPT = -xO2 diff --git a/config/Makefile.solaris-gcc b/config/Makefile.solaris-gcc index 53c704d..a950222 100644 --- a/config/Makefile.solaris-gcc +++ b/config/Makefile.solaris-gcc @@ -4,7 +4,7 @@ LD ?= ld CFLAGS.EXTRA = -I/usr/openwin/include LDFLAGS.SO = -G LDFLAGS.EXTRA = -L/usr/openwin/lib -LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lX11 NAME = GLEW BIN.SUFFIX = POPT = -O2