diff options
| author | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2007-10-12 11:02:46 +1000 |
| commit | bf805d3bf5bf191aa669b6155316a78917cf9b0e (patch) | |
| tree | d76223fb22381485f7ecc8f6c7d026dcd88d80f3 /configs/freebsd-dri | |
| parent | 9e06cf00cfb24528653913fc90eded4d370c1149 (diff) | |
| parent | 72c888869f4e5074e57c349ec356798959be791e (diff) | |
Merge branch 'master' into i915-superioctl
Diffstat (limited to 'configs/freebsd-dri')
| -rw-r--r-- | configs/freebsd-dri | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configs/freebsd-dri b/configs/freebsd-dri index 9750017c23..0f52b9149b 100644 --- a/configs/freebsd-dri +++ b/configs/freebsd-dri @@ -12,7 +12,7 @@ WARN_FLAGS = -Wall OPT_FLAGS = -O -g EXPAT_INCLUDES = -I/usr/local/include -X11_INCLUDES = -I/usr/X11R6/include +X11_INCLUDES = -I/usr/local/include DEFINES = -DPTHREADS -DUSE_EXTERNAL_DXTN_LIB=1 -DIN_DRI_DRIVER \ -DGLX_DIRECT_RENDERING -DGLX_INDIRECT_RENDERING \ -DHAVE_ALIAS @@ -28,11 +28,11 @@ ASM_SOURCES = LIBDRM_CFLAGS = `pkg-config --cflags libdrm` LIBDRM_LIB = `pkg-config --libs libdrm` DRI_LIB_DEPS = -L/usr/local/lib -lm -pthread -lexpat $(LIBDRM_LIB) -GL_LIB_DEPS = -L/usr/X11R6/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ +GL_LIB_DEPS = -L/usr/local/lib -lX11 -lXext -lXxf86vm -lXdamage -lXfixes \ -lm -pthread $(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 +GLUT_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGLU -lGL -lX11 -lXmu -lXt -lXi -lm +GLW_LIB_DEPS = -L$(TOP)/$(LIB_DIR) -L/usr/local/lib -lGL -lXt -lX11 # Directories |