aboutsummaryrefslogtreecommitdiffstats
path: root/src/gallium/targets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/targets')
-rw-r--r--src/gallium/targets/Makefile.va1
-rw-r--r--src/gallium/targets/Makefile.vdpau1
-rw-r--r--src/gallium/targets/Makefile.xvmc1
-rw-r--r--src/gallium/targets/va-r300/Makefile4
-rw-r--r--src/gallium/targets/va-r600/Makefile6
-rw-r--r--src/gallium/targets/va-softpipe/Makefile2
-rw-r--r--src/gallium/targets/vdpau-nouveau/Makefile4
-rw-r--r--src/gallium/targets/vdpau-r300/Makefile3
-rw-r--r--src/gallium/targets/vdpau-r600/Makefile8
-rw-r--r--src/gallium/targets/vdpau-softpipe/Makefile2
-rw-r--r--src/gallium/targets/xvmc-nouveau/Makefile2
-rw-r--r--src/gallium/targets/xvmc-r300/Makefile4
-rw-r--r--src/gallium/targets/xvmc-r600/Makefile8
-rw-r--r--src/gallium/targets/xvmc-softpipe/Makefile2
14 files changed, 27 insertions, 21 deletions
diff --git a/src/gallium/targets/Makefile.va b/src/gallium/targets/Makefile.va
index 7215fc3a504..884b59d224e 100644
--- a/src/gallium/targets/Makefile.va
+++ b/src/gallium/targets/Makefile.va
@@ -8,7 +8,6 @@ INCLUDES = -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/winsys \
- -I$(TOP)/src/gallium/winsys/g3dvl \
$(DRIVER_INCLUDES)
DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VA_MAJOR) -DVER_MINOR=$(VA_MINOR) $(DRIVER_DEFINES)
LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lva -lXext -lX11 -lm
diff --git a/src/gallium/targets/Makefile.vdpau b/src/gallium/targets/Makefile.vdpau
index 2c2385c4f1f..a9e7a9c9549 100644
--- a/src/gallium/targets/Makefile.vdpau
+++ b/src/gallium/targets/Makefile.vdpau
@@ -8,7 +8,6 @@ INCLUDES = -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/winsys \
- -I$(TOP)/src/gallium/winsys/g3dvl \
$(DRIVER_INCLUDES)
DEFINES = -DGALLIUM_TRACE -DVER_MAJOR=$(VDPAU_MAJOR) -DVER_MINOR=$(VDPAU_MINOR) $(DRIVER_DEFINES)
LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lvdpau -lX11-xcb -lxcb-dri2 -lm -lrt
diff --git a/src/gallium/targets/Makefile.xvmc b/src/gallium/targets/Makefile.xvmc
index 5eafe9836e1..217481e48e8 100644
--- a/src/gallium/targets/Makefile.xvmc
+++ b/src/gallium/targets/Makefile.xvmc
@@ -8,7 +8,6 @@ INCLUDES = -I$(TOP)/src/gallium/include \
-I$(TOP)/src/gallium/drivers \
-I$(TOP)/src/gallium/auxiliary \
-I$(TOP)/src/gallium/winsys \
- -I$(TOP)/src/gallium/winsys/g3dvl \
$(DRIVER_INCLUDES)
DEFINES = -DGALLIUM_TRACE $(DRIVER_DEFINES)
LIBS = $(EXTRA_LIB_PATH) $(DRIVER_LIBS) -lXv -lX11-xcb -lxcb-dri2 -lm
diff --git a/src/gallium/targets/va-r300/Makefile b/src/gallium/targets/va-r300/Makefile
index a270dfa7c99..7c89c79b5cc 100644
--- a/src/gallium/targets/va-r300/Makefile
+++ b/src/gallium/targets/va-r300/Makefile
@@ -4,11 +4,10 @@ include $(TOP)/configs/current
LIBBASENAME = r300_drv_video
DRIVER_DEFINES = -DGALLIUM_SOFTPIPE
-DRIVER_INCLUDES =
+DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/r300/libr300.a \
- $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
@@ -16,6 +15,7 @@ PIPE_DRIVERS = \
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
diff --git a/src/gallium/targets/va-r600/Makefile b/src/gallium/targets/va-r600/Makefile
index afead84391b..50e7fa5e560 100644
--- a/src/gallium/targets/va-r600/Makefile
+++ b/src/gallium/targets/va-r600/Makefile
@@ -4,18 +4,18 @@ include $(TOP)/configs/current
LIBBASENAME = r600_drv_video
DRIVER_DEFINES = -DGALLIUM_SOFTPIPE
-DRIVER_INCLUDES =
+DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/r600/libr600.a \
- $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
- $(TOP)/src/gallium/drivers/trace/libtrace.a \
+ $(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/auxiliary/libgallium.a
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
diff --git a/src/gallium/targets/va-softpipe/Makefile b/src/gallium/targets/va-softpipe/Makefile
index a58df36a966..536cb7b2903 100644
--- a/src/gallium/targets/va-softpipe/Makefile
+++ b/src/gallium/targets/va-softpipe/Makefile
@@ -12,7 +12,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/auxiliary/libgallium.a
C_SOURCES = \
- $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
DRIVER_LIBS =
diff --git a/src/gallium/targets/vdpau-nouveau/Makefile b/src/gallium/targets/vdpau-nouveau/Makefile
index 55f990749cf..d3f1c7df8db 100644
--- a/src/gallium/targets/vdpau-nouveau/Makefile
+++ b/src/gallium/targets/vdpau-nouveau/Makefile
@@ -3,8 +3,9 @@ include $(TOP)/configs/current
LIBBASENAME = vdpau_nouveau
+DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
+
PIPE_DRIVERS = \
- $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
$(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
$(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
@@ -16,6 +17,7 @@ PIPE_DRIVERS = \
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
diff --git a/src/gallium/targets/vdpau-r300/Makefile b/src/gallium/targets/vdpau-r300/Makefile
index 849f72e03e8..1ada550af15 100644
--- a/src/gallium/targets/vdpau-r300/Makefile
+++ b/src/gallium/targets/vdpau-r300/Makefile
@@ -3,10 +3,10 @@ include $(TOP)/configs/current
LIBBASENAME = vdpau_r300
+DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/r300/libr300.a \
- $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
$(TOP)/src/gallium/drivers/rbug/librbug.a \
@@ -17,6 +17,7 @@ PIPE_DRIVERS = \
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
diff --git a/src/gallium/targets/vdpau-r600/Makefile b/src/gallium/targets/vdpau-r600/Makefile
index ef27b6572c2..05e0b4f45f1 100644
--- a/src/gallium/targets/vdpau-r600/Makefile
+++ b/src/gallium/targets/vdpau-r600/Makefile
@@ -3,15 +3,17 @@ include $(TOP)/configs/current
LIBBASENAME = vdpau_r600
+DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
+
PIPE_DRIVERS = \
- $(TOP)/src/gallium/drivers/r600/libr600.a \
- $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
+ $(TOP)/src/gallium/drivers/r600/libr600.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
- $(TOP)/src/gallium/drivers/trace/libtrace.a \
+ $(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/auxiliary/libgallium.a
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
diff --git a/src/gallium/targets/vdpau-softpipe/Makefile b/src/gallium/targets/vdpau-softpipe/Makefile
index 139b01b982a..41cc514929c 100644
--- a/src/gallium/targets/vdpau-softpipe/Makefile
+++ b/src/gallium/targets/vdpau-softpipe/Makefile
@@ -12,7 +12,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/auxiliary/libgallium.a
C_SOURCES = \
- $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
DRIVER_LIBS =
diff --git a/src/gallium/targets/xvmc-nouveau/Makefile b/src/gallium/targets/xvmc-nouveau/Makefile
index 67036ee5090..06727f1c9f8 100644
--- a/src/gallium/targets/xvmc-nouveau/Makefile
+++ b/src/gallium/targets/xvmc-nouveau/Makefile
@@ -4,7 +4,6 @@ include $(TOP)/configs/current
LIBBASENAME = XvMCnouveau
PIPE_DRIVERS = \
- $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
$(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \
$(TOP)/src/gallium/drivers/nvfx/libnvfx.a \
$(TOP)/src/gallium/drivers/nv50/libnv50.a \
@@ -16,6 +15,7 @@ PIPE_DRIVERS = \
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
diff --git a/src/gallium/targets/xvmc-r300/Makefile b/src/gallium/targets/xvmc-r300/Makefile
index 221335aae72..800f8d5254c 100644
--- a/src/gallium/targets/xvmc-r300/Makefile
+++ b/src/gallium/targets/xvmc-r300/Makefile
@@ -3,15 +3,17 @@ include $(TOP)/configs/current
LIBBASENAME = XvMCr300
+DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
+
PIPE_DRIVERS = \
$(TOP)/src/gallium/drivers/r300/libr300.a \
- $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
$(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/auxiliary/libgallium.a
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
diff --git a/src/gallium/targets/xvmc-r600/Makefile b/src/gallium/targets/xvmc-r600/Makefile
index 666712015d5..d9ce72f11df 100644
--- a/src/gallium/targets/xvmc-r600/Makefile
+++ b/src/gallium/targets/xvmc-r600/Makefile
@@ -3,15 +3,17 @@ include $(TOP)/configs/current
LIBBASENAME = XvMCr600
+DRIVER_INCLUDES = $(shell $(PKG_CONFIG) libdrm --cflags-only-I)
+
PIPE_DRIVERS = \
- $(TOP)/src/gallium/drivers/r600/libr600.a \
- $(TOP)/src/gallium/winsys/g3dvl/dri/libvldri.a \
+ $(TOP)/src/gallium/drivers/r600/libr600.a \
$(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \
- $(TOP)/src/gallium/drivers/trace/libtrace.a \
+ $(TOP)/src/gallium/drivers/trace/libtrace.a \
$(TOP)/src/gallium/auxiliary/libgallium.a
C_SOURCES = \
target.c \
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_dri.c \
$(COMMON_GALLIUM_SOURCES) \
$(DRIVER_SOURCES)
diff --git a/src/gallium/targets/xvmc-softpipe/Makefile b/src/gallium/targets/xvmc-softpipe/Makefile
index 5b60bede589..35db16f08e4 100644
--- a/src/gallium/targets/xvmc-softpipe/Makefile
+++ b/src/gallium/targets/xvmc-softpipe/Makefile
@@ -12,7 +12,7 @@ PIPE_DRIVERS = \
$(TOP)/src/gallium/auxiliary/libgallium.a
C_SOURCES = \
- $(TOP)/src/gallium/winsys/g3dvl/xlib/xsp_winsys.c
+ $(TOP)/src/gallium/auxiliary/vl/vl_winsys_xsp.c
DRIVER_LIBS =
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-29 21:39:59 +0000