diff options
| author | Marek Olšák <[email protected]> | 2011-09-27 16:42:01 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-09-30 23:19:52 +0200 |
| commit | bf0baa771709e1076613cf9f9bed6ac004dd0439 (patch) | |
| tree | 02a54fd5ee82e00c00de2d224cb37db862759c40 /src/gallium/targets/egl-static | |
| parent | 363ff844753c46ac9c13866627e096b091ea81f8 (diff) | |
r600g: move all files from winsys/r600 into drivers/r600
Be sure to reconfigure after this commit.
Reviewed-by: Alex Deucher <[email protected]>
Diffstat (limited to 'src/gallium/targets/egl-static')
| -rw-r--r-- | src/gallium/targets/egl-static/Makefile | 5 | ||||
| -rw-r--r-- | src/gallium/targets/egl-static/SConscript | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile index 2c07455ee4a..17a578d43af 100644 --- a/src/gallium/targets/egl-static/Makefile +++ b/src/gallium/targets/egl-static/Makefile @@ -129,13 +129,14 @@ endif endif # r600 -ifneq ($(findstring r600/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) +ifneq ($(findstring r600,$(GALLIUM_DRIVERS_DIRS)),) egl_CPPFLAGS += -D_EGL_PIPE_R600=1 egl_LIBS += \ - $(TOP)/src/gallium/winsys/r600/drm/libr600winsys.a \ $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ $(TOP)/src/gallium/drivers/r600/libr600.a endif +endif # vmwgfx ifneq ($(findstring svga/drm,$(GALLIUM_WINSYS_DIRS)),) diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript index dfd05437231..a929d600349 100644 --- a/src/gallium/targets/egl-static/SConscript +++ b/src/gallium/targets/egl-static/SConscript @@ -104,7 +104,6 @@ if env['HAVE_DRM']: env.Prepend(LIBS = [ radeonwinsys, r300, - r600winsys, r600, ]) |