diff options
| author | Brian Paul <brianp@vmware.com> | 2009-02-09 09:22:22 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-02-09 09:22:22 -0700 |
| commit | e97681c7f551a2a2a6bd5eff0f4192a870c816c0 (patch) | |
| tree | dff2bf0e6d22efb92af131f64be0621ed316977c /configs/freebsd-dri | |
| parent | 1a46c8a062aea59de5cf55881104489db5d609e5 (diff) | |
| parent | b907d4cd8fafe719b4f87d877562829548937485 (diff) | |
| download | external_mesa3d-e97681c7f551a2a2a6bd5eff0f4192a870c816c0.zip external_mesa3d-e97681c7f551a2a2a6bd5eff0f4192a870c816c0.tar.gz external_mesa3d-e97681c7f551a2a2a6bd5eff0f4192a870c816c0.tar.bz2 | |
mesa: merge gallium-0.2 into gallium-master-merge
Merge commit 'origin/gallium-0.2' into gallium-master-merge
Conflicts:
Makefile
docs/relnotes-7.4.html
docs/relnotes.html
src/mesa/drivers/dri/i965/brw_wm.h
src/mesa/main/imports.c
src/mesa/main/mtypes.h
src/mesa/main/texcompress.c
src/mesa/main/texenvprogram.c
src/mesa/main/version.h
src/mesa/vbo/vbo_exec_api.c
src/mesa/vbo/vbo_save_draw.c
Diffstat (limited to 'configs/freebsd-dri')
| -rw-r--r-- | configs/freebsd-dri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 9d92154..0ec25f9 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -27,6 +27,7 @@ CFLAGS += -fno-strict-aliasing CXXFLAGS += -fno-strict-aliasing ASM_SOURCES = +MESA_ASM_SOURCES = # Library/program dependencies LIBDRM_CFLAGS = `pkg-config --cflags libdrm` @@ -40,7 +41,7 @@ GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 # Directories -SRC_DIRS = glx/x11 mesa glu glut/glx glw +SRC_DIRS = glx/x11 gallium mesa glu glut/glx glew glw DRIVER_DIRS = dri PROGRAM_DIRS = WINDOW_SYSTEM=dri |