diff options
| author | Johannes Obermayr <johannesobermayr@gmx.de> | 2011-06-02 17:15:44 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2011-06-02 17:21:26 -0600 |
| commit | 873379a8818eed9ab16c24728b7091a3a3705c5b (patch) | |
| tree | 99b10cddd04027aed935e5fa7d17f165b1b56ba8 /configs | |
| parent | a9c5efb11104d8cfe3139c5c9b6e4b0a4fcb7de5 (diff) | |
dri/nouveau: Fix build with --enable-shared-dricore.
- Based on the work of Себастьян Gliţa Κατινα <cglita@yahoo.com>
- Split Makefile.template into Makefile.defines and Makefile.targets
- Adapt other drivers to new situation
- Fixes https://bugs.freedesktop.org/show_bug.cgi?id=35441
Signed-off-by: Brian Paul <brianp@vmware.com>
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 a484bcff996..abc01b1b2dd 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 7ee007e3527..c4132f47271 100644 --- a/configs/linux-dri +++ b/configs/linux-dri @@ -63,11 +63,16 @@ GALLIUM_WINSYS_DIRS = sw sw/xlib drm/vmware drm/intel drm/i965 GALLIUM_TARGET_DIRS = GALLIUM_STATE_TRACKERS_DIRS = egl -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) |