diff options
| author | Jakob Bornecrantz <wallbraker@gmail.com> | 2010-03-25 19:19:00 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <wallbraker@gmail.com> | 2010-03-26 00:38:17 +0100 |
| commit | bc88c95990f871a206a8fe93e7541f1f41841f7e (patch) | |
| tree | fe394e2b3dedc3ab6de5c2f108bf0c5c78983872 /src/gallium/targets | |
| parent | 80672e84cf79ab12b7a4ff56567184d1c39baef3 (diff) | |
i915g: Rename winsys prefix to i915_ from intel_
Since the winsys isn't shared with i965 and never will be
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/targets/dri-i915/Makefile | 2 | ||||
| -rw-r--r-- | src/gallium/targets/dri-i915/SConscript | 2 | ||||
| -rw-r--r-- | src/gallium/targets/egl-i915/Makefile | 2 | ||||
| -rw-r--r-- | src/gallium/targets/xorg-i915/Makefile | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gallium/targets/SConscript b/src/gallium/targets/SConscript index 3864564688..a41496a5dd 100644 --- a/src/gallium/targets/SConscript +++ b/src/gallium/targets/SConscript @@ -62,7 +62,7 @@ if env['dri']: 'dri-vmwgfx/SConscript', ]) - if 'intel' in env['winsys']: + if 'i915' in env['winsys']: SConscript([ 'dri-i915/SConscript', ]) diff --git a/src/gallium/targets/dri-i915/Makefile b/src/gallium/targets/dri-i915/Makefile index 822d4b57bb..50a8e11e17 100644 --- a/src/gallium/targets/dri-i915/Makefile +++ b/src/gallium/targets/dri-i915/Makefile @@ -5,7 +5,7 @@ LIBNAME = i915_dri.so PIPE_DRIVERS = \ $(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \ - $(TOP)/src/gallium/winsys/i915/drm/libinteldrm.a \ + $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/drivers/identity/libidentity.a \ diff --git a/src/gallium/targets/dri-i915/SConscript b/src/gallium/targets/dri-i915/SConscript index 8d4ecefbe1..f6d1f93478 100644 --- a/src/gallium/targets/dri-i915/SConscript +++ b/src/gallium/targets/dri-i915/SConscript @@ -10,7 +10,7 @@ env.ParseConfig('pkg-config --cflags --libs libdrm_intel') env.Prepend(LIBS = [ st_dri, - inteldrm, + i915drm, i915, trace, mesa, diff --git a/src/gallium/targets/egl-i915/Makefile b/src/gallium/targets/egl-i915/Makefile index 6c2fc14d70..efaf7b0bef 100644 --- a/src/gallium/targets/egl-i915/Makefile +++ b/src/gallium/targets/egl-i915/Makefile @@ -6,7 +6,7 @@ EGL_DRIVER_SOURCES = dummy.c EGL_DRIVER_LIBS = -ldrm_intel EGL_DRIVER_PIPES = \ - $(TOP)/src/gallium/winsys/i915/drm/libinteldrm.a \ + $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/drivers/i915/libi915.a diff --git a/src/gallium/targets/xorg-i915/Makefile b/src/gallium/targets/xorg-i915/Makefile index e2cffcd70b..52a9e97b40 100644 --- a/src/gallium/targets/xorg-i915/Makefile +++ b/src/gallium/targets/xorg-i915/Makefile @@ -17,7 +17,7 @@ INCLUDES = \ LIBS = \ $(TOP)/src/gallium/state_trackers/xorg/libxorgtracker.a \ - $(TOP)/src/gallium/winsys/i915/drm/libinteldrm.a \ + $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \ $(TOP)/src/gallium/drivers/i915/libi915.a \ $(TOP)/src/gallium/drivers/trace/libtrace.a \ $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \ |