diff options
| author | Christian König <[email protected]> | 2011-06-05 00:11:41 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-06-05 00:11:41 +0200 |
| commit | 1eb957bb4108123bea95b818e0544e3b5f255e08 (patch) | |
| tree | d7febd8e6cc841ab16dca53f031322ec47d5ccd9 /configs | |
| parent | a6c76c8a90dc8995feed3c61b02dbd8408149036 (diff) | |
| parent | 6491e9593d5cbc5644eb02593a2f562447efdcbb (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 2 | ||||
| -rw-r--r-- | configs/linux-dri | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index 58767273884..5595e2abbb6 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -26,6 +26,8 @@ LDFLAGS = @LDFLAGS@ EXTRA_LIB_PATH = @EXTRA_LIB_PATH@ RADEON_CFLAGS = @RADEON_CFLAGS@ RADEON_LDFLAGS = @RADEON_LDFLAGS@ +NOUVEAU_CFLAGS = @NOUVEAU_CFLAGS@ +NOUVEAU_LIBS = @NOUVEAU_LIBS@ INTEL_LIBS = @INTEL_LIBS@ INTEL_CFLAGS = @INTEL_CFLAGS@ X11_LIBS = @X11_LIBS@ diff --git a/configs/linux-dri b/configs/linux-dri index 4f4b59dae9e..e88d3f0ca72 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -64,11 +64,16 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 GALLIUM_TARGET_DIRS = egl-swrast GALLIUM_STATE_TRACKERS_DIRS = egl vdpau -DRI_DIRS = i810 i915 i965 mach64 mga r128 r200 r300 r600 radeon \ +DRI_DIRS = i810 i915 i965 mach64 mga nouveau r128 r200 r300 r600 radeon \ savage sis tdfx unichrome swrast -INTEL_LIBS = `pkg-config --libs libdrm_intel` -INTEL_CFLAGS = `pkg-config --cflags libdrm_intel` +INTEL_LIBS = $(shell pkg-config --libs libdrm_intel) +INTEL_CFLAGS = $(shell pkg-config --cflags libdrm_intel) -RADEON_LIBS = `pkg-config --libs libdrm_radeon` -RADEON_CFLAGS = `pkg-config --cflags libdrm_radeon` +NOUVEAU_LIBS = $(shell pkg-config --libs libdrm_nouveau) +NOUVEAU_CFLAGS = $(shell pkg-config --cflags libdrm_nouveau) + +LIBDRM_RADEON_LIBS = $(shell pkg-config --libs libdrm_radeon) +LIBDRM_RADEON_CFLAGS = $(shell pkg-config --cflags libdrm_radeon) +RADEON_CFLAGS = "-DHAVE_LIBDRM_RADEON=1 $(LIBDRM_RADEON_CFLAGS)" +RADEON_LDFLAGS = $(LIBDRM_RADEON_LIBS) |