summaryrefslogtreecommitdiff
path: root/configs
diff options
context:
space:
mode:
authorJakob Bornecrantz <jakob@vmware.com>2010-06-05 13:33:58 +0200
committerJakob Bornecrantz <jakob@vmware.com>2010-06-08 02:07:24 +0200
commit0528106cc7a4f87f4920b10d995f881f81ca4154 (patch)
tree01ee11144c4d1a16911c656800d58b417f0882d5 /configs
parent1574fb78465136b90e42126607a4d39c3db778de (diff)
glew: Drop glew now that we don't need it for the progs
configs/beos | 2 +- configs/darwin | 2 +- configs/default | 4 +- configs/freebsd-dri | 2 +- configs/linux-cell | 2 +- configs/linux-dri-xcb | 2 +- configs/linux-indirect | 2 +- configure.ac | 2 +- include/GL/glew.h |14435 ------------------------------------------------ include/GL/glxew.h | 1476 ----- include/GL/wglew.h | 1247 ----- src/SConscript | 1 - src/glew/LICENSE.txt | 73 - src/glew/Makefile | 54 - src/glew/SConscript | 69 - src/glew/glew.c |14320 ----------------------------------------------- src/glew/glewinfo.c | 8441 ---------------------------- src/glew/visualinfo.c | 1173 ---- 18 files changed, 8 insertions(+), 41299 deletions(-) Revert "glew: update to version 1.5.4" This reverts commit a189b1c53b6a3b6c055cc86145c8ef48c580e9d0. Revert "glew: Include X11 headers and libraries in SCons build." This reverts commit efdd33985cb38429aeae845a556db2322957e71a. Revert "scons: Fix GLEW build on Mac OS X." This reverts commit 8f81769148eab0042ffb7192a702350275648715. Revert "scons: Use static glew library on Unices to avoid binary compatability issues" This reverts commit de22c940a1df66d13825dd15c015eafabb61a11d. Revert "glew: Update to version 1.5.2." This reverts commit aaf7ecfd816f82fef314f4f772cc53bc0ced553e. Revert "scons: Build glew on all platforms." This reverts commit 52eb3e4235cc661ab9626a704c555a5f096c628a. Revert "scons: Put glut and glew shared libraries into build/xxx/bin or lib." This reverts commit 8a318edd0838ee3343be0425019d93541b621567. Didn't revert scons/gallium.py Revert "scons: Fix glew build on MSVC." This reverts commit 14a8c9dac7ea43ad8a45052e17f7127451344e5a. Revert "scons: Build progs together with everything else." This reverts commit 7bbf7f94ea786e41ff1364cedaf7dd5c0bbf605a. Only changed src/glew/SConscript Revert "mesa: include glew headers in MesaDemos tarballs" This reverts commit c57d81ddc9ba3052ff7f6b72091accab2c2db0ae. Revert "mesa: include GLEW sources in MesaDemos tarball" This reverts commit b9e2e32daf5505896a662dc8df60104c0f51b4b9. Revert "glew: correct misspelling of glFramebufferTextureLayer" This reverts commit 1b05b5b4fecd9ac8ef34abdda6c085868016ad84. Revert "glew: fix GLEW_LIB_NAME" This reverts commit c10df26a31b6af5a720fbfd06411d580cd38a2c8. Revert "Add dummy install target for glew to fix 'make install'" This reverts commit c273dfe6a28d4bb64ce167685b4053d22db5a727. Revert "autoconf: Add GLEW needed by progs when building GLUT" This reverts commit 2977cee38e21b8e5ebba1635b101185d64ee44a9. Revert "glew: Build it as a static lib." This reverts commit fcf9353fea8343a1a86c8c6e0144c8429440c648. Revert "glew: Initial import." This reverts commit 57d00016cab9afa3e7853d9830044a8ece9541c4.
Diffstat (limited to 'configs')
-rw-r--r--configs/beos2
-rw-r--r--configs/darwin2
-rw-r--r--configs/default4
-rw-r--r--configs/freebsd-dri2
-rw-r--r--configs/linux-cell2
-rw-r--r--configs/linux-dri-xcb2
-rw-r--r--configs/linux-indirect2
7 files changed, 7 insertions, 9 deletions
diff --git a/configs/beos b/configs/beos
index 6a2d5ef9fb6..ac8d6fc6f21 100644
--- a/configs/beos
+++ b/configs/beos
@@ -90,7 +90,7 @@ else
endif
# Directories
-SRC_DIRS = gallium mesa glu glut/beos glew
+SRC_DIRS = gallium mesa glu glut/beos
GLU_DIRS = sgi
DRIVER_DIRS = beos
diff --git a/configs/darwin b/configs/darwin
index 147679f07a7..990610724b5 100644
--- a/configs/darwin
+++ b/configs/darwin
@@ -52,7 +52,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X
APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -L$(X11_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm
# omit glw lib for now:
-SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu glut/glx glew
+SRC_DIRS = glsl mapi/glapi mapi/vgapi glx/apple mesa gallium glu glut/glx
GLU_DIRS = sgi
DRIVER_DIRS = osmesa
#DRIVER_DIRS = dri
diff --git a/configs/default b/configs/default
index 9f50c7529e9..9241e807977 100644
--- a/configs/default
+++ b/configs/default
@@ -52,7 +52,6 @@ INDENT_FLAGS = -i4 -nut -br -brs -npcs -ce -T GLubyte -T GLbyte -T Bool
GL_LIB = GL
GLU_LIB = GLU
GLUT_LIB = glut
-GLEW_LIB = GLEW
GLW_LIB = GLw
OSMESA_LIB = OSMesa
EGL_LIB = EGL
@@ -65,7 +64,6 @@ VG_LIB = OpenVG
GL_LIB_NAME = lib$(GL_LIB).so
GLU_LIB_NAME = lib$(GLU_LIB).so
GLUT_LIB_NAME = lib$(GLUT_LIB).so
-GLEW_LIB_NAME = lib$(GLEW_LIB).a
GLW_LIB_NAME = lib$(GLW_LIB).so
OSMESA_LIB_NAME = lib$(OSMESA_LIB).so
EGL_LIB_NAME = lib$(EGL_LIB).so
@@ -96,7 +94,7 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2
# Directories to build
LIB_DIR = lib
SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
- gallium egl gallium/winsys gallium/targets glu glut/glx glew glw
+ gallium egl gallium/winsys gallium/targets glu glut/glx glw
GLU_DIRS = sgi
DRIVER_DIRS = x11 osmesa
diff --git a/configs/freebsd-dri b/configs/freebsd-dri
index a80a7ce3420..a4aa82e96df 100644
--- a/configs/freebsd-dri
+++ b/configs/freebsd-dri
@@ -41,7 +41,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11
# Directories
-SRC_DIRS = glx gallium mesa glu glut/glx glew glw
+SRC_DIRS = glx gallium mesa glu glut/glx glw
DRIVER_DIRS = dri
DRM_SOURCE_PATH=$(TOP)/../drm
diff --git a/configs/linux-cell b/configs/linux-cell
index 2b0c41ed6ac..606a11a8c14 100644
--- a/configs/linux-cell
+++ b/configs/linux-cell
@@ -38,7 +38,7 @@ CXXFLAGS = $(COMMON_C_CPP_FLAGS)
# Omitting glw here:
SRC_DIRS = glsl mapi/glapi mapi/vgapi mesa \
- gallium gallium/winsys gallium/targets glu glut/glx glew
+ gallium gallium/winsys gallium/targets glu glut/glx
# Build no traditional Mesa drivers:
DRIVER_DIRS =
diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb
index cf78ac4feba..8092a048d7c 100644
--- a/configs/linux-dri-xcb
+++ b/configs/linux-dri-xcb
@@ -47,7 +47,7 @@ DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB)
GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \
$(LIBDRM_LIB) $(shell pkg-config --libs xcb) $(shell pkg-config --libs x11-xcb) $(shell pkg-config --libs xcb-glx)
-SRC_DIRS = glx gallium mesa glu glut/glx glew glw
+SRC_DIRS = glx gallium mesa glu glut/glx glw
DRIVER_DIRS = dri
DRI_DIRS = i810 i915 mach64 mga r128 r200 r300 radeon \
diff --git a/configs/linux-indirect b/configs/linux-indirect
index 2d19a5e417a..272d34e8407 100644
--- a/configs/linux-indirect
+++ b/configs/linux-indirect
@@ -47,5 +47,5 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl
# Directories
-SRC_DIRS = glx glu glut/glx glew glw
+SRC_DIRS = glx glu glut/glx glw
DRIVER_DIRS =