diff options
| author | Brian <[email protected]> | 2007-01-06 14:55:07 -0700 |
|---|---|---|
| committer | Brian <[email protected]> | 2007-01-06 14:55:07 -0700 |
| commit | f1fbaf39ff9b818c17c3a3f35e9517b4d826ec61 (patch) | |
| tree | 2bf80cec463b1552ee7eb1192dc4ed5aa3df9823 /configs | |
| parent | ade39f53f659ab9774ab14ebfefd18eb71f1d4ac (diff) | |
| parent | c2b185cff82a6cdb723cda4e05ffe1a213a9de3e (diff) | |
Merge branch 'master' of git+ssh://[email protected]/git/mesa/mesa
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/freebsd-dri | 3 | ||||
| -rw-r--r-- | configs/linux-dri | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 68877c612e7..1492e4a4d9b 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -28,7 +28,8 @@ ASM_SOURCES = LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `pkg-config --libs libdrm` DRI_LIB_DEPS = -L/usr/local/lib -lm -lpthread -lexpat $(LIBDRM_LIB) -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lm -lpthread $(LIBDRM_LIB) +GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -lpthread $(LIBDRM_LIB) GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/X11R6/lib -lGL -lXt -lX11 diff --git a/configs/linux-dri b/configs/linux-dri index 7e822e2eb61..5f945a73f1a 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -41,7 +41,8 @@ EXTRA_LIB_PATH=-L/usr/X11R6/lib LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `pkg-config --libs libdrm` DRI_LIB_DEPS = $(EXTRA_LIB_PATH) -lm -lpthread -lexpat -ldl $(LIBDRM_LIB) -GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lm -lpthread -ldl \ +GL_LIB_DEPS = $(EXTRA_LIB_PATH) -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ + -lm -lpthread -ldl \ $(LIBDRM_LIB) |