diff options
| author | Christian König <[email protected]> | 2010-10-12 23:05:25 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-10-12 23:07:29 +0200 |
| commit | 695cc370a280a637f411f5ff3877b3fd1c05e424 (patch) | |
| tree | 69ae2a8fbecfa553faba59274688ffe11ee1a612 /src/gallium/targets/dri-radeong | |
| parent | f3e34ba6fba76870b1c91a27adb706d1b87aeec8 (diff) | |
| parent | 48156b87bc9d3e09ec34372d69504a787332ea0b (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa into pipe-video
Conflicts:
configure.ac
src/gallium/drivers/nvfx/Makefile
src/gallium/include/pipe/p_defines.h
src/gallium/include/pipe/p_screen.h
src/gallium/include/state_tracker/dri1_api.h
src/gallium/include/state_tracker/drm_api.h
src/gallium/winsys/nouveau/drm/nouveau_drm_api.c
Diffstat (limited to 'src/gallium/targets/dri-radeong')
| -rw-r--r-- | src/gallium/targets/dri-radeong/Makefile | 21 | ||||
| -rw-r--r-- | src/gallium/targets/dri-radeong/SConscript | 26 | ||||
| -rw-r--r-- | src/gallium/targets/dri-radeong/dummy.c | 0 |
3 files changed, 0 insertions, 47 deletions
diff --git a/src/gallium/targets/dri-radeong/Makefile b/src/gallium/targets/dri-radeong/Makefile deleted file mode 100644 index 66dd392b68b..00000000000 --- a/src/gallium/targets/dri-radeong/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../../../.. -include $(TOP)/configs/current - -LIBNAME = radeong_dri.so - -PIPE_DRIVERS = \ - $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.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/r300/libr300.a - -C_SOURCES = \ - $(COMMON_GALLIUM_SOURCES) \ - $(DRIVER_SOURCES) - -include ../Makefile.dri - -DRI_LIB_DEPS += -ldrm_radeon - -symlinks: diff --git a/src/gallium/targets/dri-radeong/SConscript b/src/gallium/targets/dri-radeong/SConscript deleted file mode 100644 index d926c272889..00000000000 --- a/src/gallium/targets/dri-radeong/SConscript +++ /dev/null @@ -1,26 +0,0 @@ -Import('*') - -if not 'r300' in env['drivers']: - print 'warning: r300 pipe driver not built skipping radeong_dri.so' - Return() - -env = drienv.Clone() - -env.ParseConfig('pkg-config --cflags --libs libdrm_radeon') - -env.Prepend(LIBS = [ - st_dri, - radeonwinsys, - r300, - trace, - mesa, - glsl, - gallium, - COMMON_DRI_DRM_OBJECTS -]) - -env.SharedLibrary( - target ='radeon_dri.so', - source = 'dummy.c', - SHLIBPREFIX = '', -) diff --git a/src/gallium/targets/dri-radeong/dummy.c b/src/gallium/targets/dri-radeong/dummy.c deleted file mode 100644 index e69de29bb2d..00000000000 --- a/src/gallium/targets/dri-radeong/dummy.c +++ /dev/null |