diff options
Diffstat (limited to 'configs')
-rw-r--r-- | configs/beos | 2 | ||||
-rw-r--r-- | configs/darwin | 2 | ||||
-rw-r--r-- | configs/darwin-x86ppc | 2 | ||||
-rw-r--r-- | configs/default | 4 | ||||
-rw-r--r-- | configs/freebsd-dri | 2 | ||||
-rw-r--r-- | configs/linux-cell | 2 | ||||
-rw-r--r-- | configs/linux-directfb | 2 | ||||
-rw-r--r-- | configs/linux-dri-xcb | 4 | ||||
-rw-r--r-- | configs/linux-fbdev | 2 | ||||
-rw-r--r-- | configs/linux-indirect | 2 | ||||
-rw-r--r-- | configs/linux-solo | 2 |
11 files changed, 14 insertions, 12 deletions
diff --git a/configs/beos b/configs/beos index 897c36868f..69a8fd4269 100644 --- a/configs/beos +++ b/configs/beos @@ -90,7 +90,7 @@ else endif # Directories -SRC_DIRS = gallium mesa glu glut/beos +SRC_DIRS = gallium mesa glu glut/beos glew GLU_DIRS = sgi DRIVER_DIRS = beos PROGRAM_DIRS = beos samples redbook demos tests diff --git a/configs/darwin b/configs/darwin index 77edf1a7b9..c50ea9c44d 100644 --- a/configs/darwin +++ b/configs/darwin @@ -47,7 +47,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L$(INSTALL_DIR)/$(LIB_DIR) -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: -SRC_DIRS = glx/x11 mesa glu glut/glx +SRC_DIRS = glx/x11 mesa glu glut/glx glew GLU_DIRS = sgi DRIVER_DIRS = osmesa #DRIVER_DIRS = dri diff --git a/configs/darwin-x86ppc b/configs/darwin-x86ppc index ebeb25051f..3d82e3040a 100644 --- a/configs/darwin-x86ppc +++ b/configs/darwin-x86ppc @@ -29,5 +29,5 @@ GLW_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXt $(TOP)/lib/GL.dylib APP_LIB_DEPS = -L$(TOP)/lib -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -L/usr/X11R6/lib -lX11 -lXmu -lXt -lXi -lm # omit glw lib for now: -SRC_DIRS = gallium mesa glu glut/glx +SRC_DIRS = gallium mesa glu glut/glx glew diff --git a/configs/default b/configs/default index 6f5f373b59..6fb8d58820 100644 --- a/configs/default +++ b/configs/default @@ -48,6 +48,7 @@ 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 @@ -56,6 +57,7 @@ OSMESA_LIB = OSMesa 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).so GLW_LIB_NAME = lib$(GLW_LIB).so OSMESA_LIB_NAME = lib$(OSMESA_LIB).so @@ -77,7 +79,7 @@ MOTIF_CFLAGS = -I/usr/include/Motif1.2 # Directories to build LIB_DIR = lib -SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glw +SRC_DIRS = mesa gallium egl gallium/winsys glu glut/glx glew glw GLU_DIRS = sgi DRIVER_DIRS = # Which subdirs under $(TOP)/progs/ to enter: diff --git a/configs/freebsd-dri b/configs/freebsd-dri index f7e1fa0c19..0ec25f916e 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/x11 gallium mesa glu glut/glx glw +SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri diff --git a/configs/linux-cell b/configs/linux-cell index 115604ad65..df08d262bd 100644 --- a/configs/linux-cell +++ b/configs/linux-cell @@ -33,7 +33,7 @@ CFLAGS = $(OPT_FLAGS) -Wall -Winline -Wmissing-prototypes \ CXXFLAGS = $(CFLAGS) # Omitting glw here: -SRC_DIRS = gallium mesa gallium/winsys glu glut/glx +SRC_DIRS = gallium mesa gallium/winsys glu glut/glx glew MKDEP_OPTIONS = -fdepend -Y diff --git a/configs/linux-directfb b/configs/linux-directfb index b1fb914a2d..9ae3de96d1 100644 --- a/configs/linux-directfb +++ b/configs/linux-directfb @@ -26,7 +26,7 @@ ifeq ($(HAVE_X86), yes) endif # Directories -SRC_DIRS = gallium mesa glu glut/directfb +SRC_DIRS = gallium mesa glu glut/directfb glew GLU_DIRS = sgi DRIVER_DIRS = directfb PROGRAM_DIRS = demos directfb diff --git a/configs/linux-dri-xcb b/configs/linux-dri-xcb index d7b00a266e..e9c15a82e4 100644 --- a/configs/linux-dri-xcb +++ b/configs/linux-dri-xcb @@ -56,10 +56,10 @@ USING_EGL=0 # Directories ifeq ($(USING_EGL), 1) -SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glw +SRC_DIRS = egl glx/x11 gallium mesa glu glut/glx glew glw PROGRAM_DIRS = egl else -SRC_DIRS = glx/x11 gallium mesa glu glut/glx glw +SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw PROGRAM_DIRS = xdemos endif diff --git a/configs/linux-fbdev b/configs/linux-fbdev index f54c73695a..0b03c33afa 100644 --- a/configs/linux-fbdev +++ b/configs/linux-fbdev @@ -9,7 +9,7 @@ CFLAGS = -O3 -ffast-math -ansi -pedantic -fPIC -D_POSIX_C_SOURCE=199309L -D_SVID # Work around aliasing bugs - developers should comment this out CFLAGS += -fno-strict-aliasing -SRC_DIRS = gallium mesa glu glut/fbdev +SRC_DIRS = gallium mesa glu glut/fbdev glew DRIVER_DIRS = fbdev osmesa PROGRAM_DIRS = fbdev demos redbook samples diff --git a/configs/linux-indirect b/configs/linux-indirect index 310ae6dde6..4b81383c07 100644 --- a/configs/linux-indirect +++ b/configs/linux-indirect @@ -47,7 +47,7 @@ GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl # Directories -SRC_DIRS = glx/x11 glu glut/glx glw +SRC_DIRS = glx/x11 glu glut/glx glew glw DRIVER_DIRS = PROGRAM_DIRS = WINDOW_SYSTEM=dri diff --git a/configs/linux-solo b/configs/linux-solo index 4be7680ca5..247a2d489a 100644 --- a/configs/linux-solo +++ b/configs/linux-solo @@ -46,7 +46,7 @@ GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLU_LIB) -l$(GL_LIB) -lm APP_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLU_LIB) -l$(GL_LIB) -lm -lpthread # Directories -SRC_DIRS = glx/mini gallium mesa glu glut/mini +SRC_DIRS = glx/mini gallium mesa glu glut/mini glew DRIVER_DIRS = dri PROGRAM_DIRS = miniglx |