diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-05 13:26:25 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-05 13:26:25 +0000 |
| commit | 092ee086db2b206b1959247e01cf43daf565d6c1 (patch) | |
| tree | c65e20b56ed101ccd70fe8e0cffdb25ae8a87731 /mesalib | |
| parent | d7c078e18995b7160a2dfa782ef5aab465396d3d (diff) | |
| parent | d40f0a49c88fc7b5162a9d8f7b64b571094e8593 (diff) | |
| download | vcxsrv-1.10.1.tar.gz vcxsrv-1.10.1.tar.bz2 vcxsrv-1.10.1.zip | |
Bumped version to 1.10.11.10.1
Added release note
svn merge ^/branches/released .
Diffstat (limited to 'mesalib')
| -rw-r--r-- | mesalib/configure.ac | 4 | ||||
| -rw-r--r-- | mesalib/scons/custom.py | 1 | ||||
| -rw-r--r-- | mesalib/scons/gallium.py | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/windows/gdi/wgl.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/mesalib/configure.ac b/mesalib/configure.ac index bfde4e870..9a4a9ad20 100644 --- a/mesalib/configure.ac +++ b/mesalib/configure.ac @@ -21,8 +21,8 @@ dnl Versions for external dependencies LIBDRM_REQUIRED=2.4.24
LIBDRM_RADEON_REQUIRED=2.4.24
LIBDRM_INTEL_REQUIRED=2.4.24
-DRI2PROTO_REQUIRED=2.1
-GLPROTO_REQUIRED=1.4.11
+DRI2PROTO_REQUIRED=2.4
+GLPROTO_REQUIRED=1.4.13
LIBDRM_XORG_REQUIRED=2.4.24
LIBKMS_XORG_REQUIRED=1.0.0
diff --git a/mesalib/scons/custom.py b/mesalib/scons/custom.py index 1aaac8285..106ffcfd1 100644 --- a/mesalib/scons/custom.py +++ b/mesalib/scons/custom.py @@ -59,6 +59,7 @@ def quietCommandLines(env): env['LEXCOMSTR'] = " Generating $TARGET ..."
env['YACCCOMSTR'] = " Generating $TARGET ..."
env['CODEGENCOMSTR'] = " Generating $TARGET ..."
+ env['INSTALLSTR'] = " Installing $TARGET ..."
def createConvenienceLibBuilder(env):
diff --git a/mesalib/scons/gallium.py b/mesalib/scons/gallium.py index a61a9af8c..002560b4e 100644 --- a/mesalib/scons/gallium.py +++ b/mesalib/scons/gallium.py @@ -74,7 +74,7 @@ def install_shared_library(env, sources, version = ()): while len(version):
version = version[:-1]
target_name = '.'.join((str(source),) + version)
- action = SCons.Action.Action(symlink, "$TARGET -> $SOURCE")
+ action = SCons.Action.Action(symlink, " Symlinking $TARGET ...")
last = env.Command(os.path.join(target_dir, target_name), last, action)
targets += last
return targets
diff --git a/mesalib/src/mesa/drivers/windows/gdi/wgl.c b/mesalib/src/mesa/drivers/windows/gdi/wgl.c index fc2d937a1..d9285c420 100644 --- a/mesalib/src/mesa/drivers/windows/gdi/wgl.c +++ b/mesalib/src/mesa/drivers/windows/gdi/wgl.c @@ -390,7 +390,7 @@ static FIXED FixedFromDouble(double d) static BOOL wglUseFontBitmaps_FX(HDC fontDevice, DWORD firstChar,
DWORD numChars, DWORD listBase)
{
-#define VERIFY(a) a
+#define VERIFY(a) (void)(a)
TEXTMETRIC metric;
BITMAPINFO *dibInfo;
|