From 3828cfb38c7b63f25f0219170795a78b0a447b3f Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sun, 5 Aug 2012 23:59:29 -0500 Subject: [PATCH] Don't link with GLU, no longer needed. --- config/Makefile.cygming | 2 +- config/Makefile.cygwin | 2 +- config/Makefile.darwin | 2 +- config/Makefile.darwin-ppc | 2 +- config/Makefile.darwin-x86_64 | 2 +- config/Makefile.freebsd | 2 +- config/Makefile.gnu | 2 +- config/Makefile.irix | 2 +- config/Makefile.kfreebsd | 2 +- config/Makefile.linux | 2 +- config/Makefile.linux-mingw32 | 2 +- config/Makefile.linux-mingw64 | 2 +- config/Makefile.mingw | 2 +- config/Makefile.netbsd | 2 +- config/Makefile.solaris | 2 +- config/Makefile.solaris-gcc | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/Makefile.cygming b/config/Makefile.cygming index 1436c65..afdd851 100644 --- a/config/Makefile.cygming +++ b/config/Makefile.cygming @@ -8,7 +8,7 @@ CC := gcc -mno-cygwin LD := gcc -mno-cygwin LN := CFLAGS.SO = -DGLEW_BUILD -LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32 +LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.EXTRA = -L$(LIBDIR) WARN = -Wall -W POPT = -O2 diff --git a/config/Makefile.cygwin b/config/Makefile.cygwin index 49d4763..b044273 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 -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic WARN = -Wall -W diff --git a/config/Makefile.darwin b/config/Makefile.darwin index 63726ce..f6f86ed 100644 --- a/config/Makefile.darwin +++ b/config/Makefile.darwin @@ -7,7 +7,7 @@ PICFLAG = -fPIC 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 -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 else LDFLAGS.GL = -framework AGL -framework OpenGL endif diff --git a/config/Makefile.darwin-ppc b/config/Makefile.darwin-ppc index a3a7d40..1162998 100644 --- a/config/Makefile.darwin-ppc +++ b/config/Makefile.darwin-ppc @@ -7,7 +7,7 @@ PICFLAG = -fPIC 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 -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 else LDFLAGS.GL = -framework AGL -framework OpenGL endif diff --git a/config/Makefile.darwin-x86_64 b/config/Makefile.darwin-x86_64 index ae3f3ce..18ab312 100644 --- a/config/Makefile.darwin-x86_64 +++ b/config/Makefile.darwin-x86_64 @@ -7,7 +7,7 @@ PICFLAG = -fPIC 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 -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -L/usr/X11R6/lib -lXmu -lXi -lGL -lXext -lX11 else LDFLAGS.GL = -framework AGL -framework OpenGL endif diff --git a/config/Makefile.freebsd b/config/Makefile.freebsd index aa3a97d..ab9d9d9 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 -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -lXmu -lXi -lGL -lXext -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 b4a0a99..09b7230 100644 --- a/config/Makefile.gnu +++ b/config/Makefile.gnu @@ -3,7 +3,7 @@ CC = cc LD = cc PICFLAG = -fPIC LDFLAGS.EXTRA = -L/usr/X11R6/lib -LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW diff --git a/config/Makefile.irix b/config/Makefile.irix index c165961..a1be5ee 100644 --- a/config/Makefile.irix +++ b/config/Makefile.irix @@ -5,7 +5,7 @@ ABI = -64# -n32 CC += $(ABI) LD += $(ABI) LDFLAGS.EXTRA = -LDFLAGS.GL = -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -lGL -lXext -lX11 NAME = GLEW WARN = -fullwarn -woff 1110,1498 POPT = -O2 -OPT:Olimit=0 diff --git a/config/Makefile.kfreebsd b/config/Makefile.kfreebsd index 8c73912..b3747e1 100644 --- a/config/Makefile.kfreebsd +++ b/config/Makefile.kfreebsd @@ -3,7 +3,7 @@ CC = cc LD = cc PICFLAG = -fPIC LDFLAGS.EXTRA = -L/usr/X11R6/lib -LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW diff --git a/config/Makefile.linux b/config/Makefile.linux index 27dccbc..b9f5181 100644 --- a/config/Makefile.linux +++ b/config/Makefile.linux @@ -10,7 +10,7 @@ else LDFLAGS.EXTRA = -L/usr/X11R6/lib -L/usr/lib LIBDIR = $(GLEW_DEST)/lib endif -LDFLAGS.GL = -lXmu -lXi -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic NAME = GLEW diff --git a/config/Makefile.linux-mingw32 b/config/Makefile.linux-mingw32 index 386658d..d9573a7 100644 --- a/config/Makefile.linux-mingw32 +++ b/config/Makefile.linux-mingw32 @@ -10,7 +10,7 @@ LD := i586-mingw32msvc-ld LN := STRIP := CFLAGS.SO = -DGLEW_BUILD -LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32 +LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe diff --git a/config/Makefile.linux-mingw64 b/config/Makefile.linux-mingw64 index d14f23d..6093351 100644 --- a/config/Makefile.linux-mingw64 +++ b/config/Makefile.linux-mingw64 @@ -10,7 +10,7 @@ LD := amd64-mingw32msvc-ld LN := STRIP := CFLAGS.SO = -DGLEW_BUILD -LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32 +LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 WARN = -Wall -W POPT = -O2 BIN.SUFFIX = .exe diff --git a/config/Makefile.mingw b/config/Makefile.mingw index e04e00d..e74fd3c 100644 --- a/config/Makefile.mingw +++ b/config/Makefile.mingw @@ -4,7 +4,7 @@ CC := gcc LD := gcc LN := CFLAGS.SO = -DGLEW_BUILD -LDFLAGS.GL = -lglu32 -lopengl32 -lgdi32 -luser32 -lkernel32 +LDFLAGS.GL = -lopengl32 -lgdi32 -luser32 -lkernel32 LDFLAGS.EXTRA = -L/mingw/lib WARN = -Wall -W POPT = -O2 diff --git a/config/Makefile.netbsd b/config/Makefile.netbsd index d7b5392..5f69cd6 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 -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 LDFLAGS.STATIC = -Wl,-Bstatic LDFLAGS.DYNAMIC = -Wl,-Bdynamic CFLAGS.EXTRA += -I/usr/X11R7/include -fPIC diff --git a/config/Makefile.solaris b/config/Makefile.solaris index b5dfebb..befba5a 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 -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 NAME = GLEW BIN.SUFFIX = POPT = -xO2 diff --git a/config/Makefile.solaris-gcc b/config/Makefile.solaris-gcc index 538e507..c0373f4 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 -lGLU -lGL -lXext -lX11 +LDFLAGS.GL = -lXmu -lXi -lGL -lXext -lX11 NAME = GLEW BIN.SUFFIX = POPT = -O2