diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-15 11:32:48 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-15 11:32:48 +0200 |
| commit | 3fbadc13acf6beb4a2497970367e2c2c1b6039ca (patch) | |
| tree | 44bc51faf9ba2bf08022a268f1a85c55fc4431ca /mesalib/configs/linux-x86-64-static | |
| parent | 4b424e0ba999b47ca62298e8104f76f940aac4d8 (diff) | |
| parent | 2ce12f084113a0097fa1a0d67e2f8fe1ab70092b (diff) | |
| download | vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.gz vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.tar.bz2 vcxsrv-3fbadc13acf6beb4a2497970367e2c2c1b6039ca.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/configure.ac
mesalib/configs/linux-dri
mesalib/docs/download.html
mesalib/src/SConscript
mesalib/src/mesa/main/bufferobj.c
mesalib/src/mesa/main/bufferobj.h
mesalib/src/mesa/main/framebuffer.c
mesalib/src/mesa/main/renderbuffer.c
mesalib/src/mesa/main/renderbuffer.h
mesalib/src/mesa/main/texobj.c
mesalib/src/mesa/program/program.c
mesalib/src/mesa/vbo/vbo_exec_array.c
xorg-server/dix/window.c
xorg-server/xkb/xkb.c
xorg-server/xkb/xkmread.c
Diffstat (limited to 'mesalib/configs/linux-x86-64-static')
| -rw-r--r-- | mesalib/configs/linux-x86-64-static | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/configs/linux-x86-64-static b/mesalib/configs/linux-x86-64-static index 626d579ac..89a0e3e03 100644 --- a/mesalib/configs/linux-x86-64-static +++ b/mesalib/configs/linux-x86-64-static @@ -10,7 +10,6 @@ PIC_FLAGS = # Library names (actual file names) GL_LIB_NAME = libGL.a GLU_LIB_NAME = libGLU.a -GLUT_LIB_NAME = libglut.a GLW_LIB_NAME = libGLw.a OSMESA_LIB_NAME = libOSMesa.a @@ -18,7 +17,6 @@ OSMESA_LIB_NAME = libOSMesa.a GL_LIB_DEPS = OSMESA_LIB_DEPS = GLU_LIB_DEPS = -GLUT_LIB_DEPS = GLW_LIB_DEPS = # Need to specify all libraries we may need |