From 7933658107276f9d5491f8736a743cf8f8bbd5f2 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 2 Apr 2010 14:47:58 +0000 Subject: Updated to following packages: mesa-7.8 --- mesalib/windows/VC8/mesa/gdi/gdi.vcproj | 8 + mesalib/windows/VC8/mesa/mesa.sln | 15 +- mesalib/windows/VC8/mesa/mesa/mesa.vcproj | 556 ++++++++++++++++++++++++++---- 3 files changed, 518 insertions(+), 61 deletions(-) (limited to 'mesalib/windows') diff --git a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj index a3dd5ef5b..220923f90 100644 --- a/mesalib/windows/VC8/mesa/gdi/gdi.vcproj +++ b/mesalib/windows/VC8/mesa/gdi/gdi.vcproj @@ -396,6 +396,10 @@ RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def" > + + @@ -417,6 +421,10 @@ RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h" > + + diff --git a/mesalib/windows/VC8/mesa/mesa.sln b/mesalib/windows/VC8/mesa/mesa.sln index dd8c706ee..915e00026 100644 --- a/mesalib/windows/VC8/mesa/mesa.sln +++ b/mesalib/windows/VC8/mesa/mesa.sln @@ -1,5 +1,5 @@ Microsoft Visual Studio Solution File, Format Version 9.00 -# Visual C++ Express 2005 +# Visual Studio 2005 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}" ProjectSection(ProjectDependencies) = postProject {2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448} @@ -11,12 +11,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2 EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}" + ProjectSection(ProjectDependencies) = postProject + {98AB3D51-1820-4D14-9195-75FCA6997784} = {98AB3D51-1820-4D14-9195-75FCA6997784} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}" ProjectSection(ProjectDependencies) = postProject {A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633} EndProjectSection EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glsl_apps_compile", "glsl_apps_compile\glsl_apps_compile.vcproj", "{98AB3D51-1820-4D14-9195-75FCA6997784}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug Static CRT|Win32 = Debug Static CRT|Win32 @@ -57,6 +62,14 @@ Global {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release Static CRT|Win32.Build.0 = Release Static CRT|Win32 {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.ActiveCfg = Release|Win32 {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.Release|Win32.Build.0 = Release|Win32 + {98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.ActiveCfg = Debug|Win32 + {98AB3D51-1820-4D14-9195-75FCA6997784}.Debug Static CRT|Win32.Build.0 = Debug|Win32 + {98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.ActiveCfg = Debug|Win32 + {98AB3D51-1820-4D14-9195-75FCA6997784}.Debug|Win32.Build.0 = Debug|Win32 + {98AB3D51-1820-4D14-9195-75FCA6997784}.Release Static CRT|Win32.ActiveCfg = Release|Win32 + {98AB3D51-1820-4D14-9195-75FCA6997784}.Release Static CRT|Win32.Build.0 = Release|Win32 + {98AB3D51-1820-4D14-9195-75FCA6997784}.Release|Win32.ActiveCfg = Release|Win32 + {98AB3D51-1820-4D14-9195-75FCA6997784}.Release|Win32.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj index 993c28ddc..f7c3c7344 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj @@ -26,9 +26,13 @@ > + + + @@ -398,10 +422,6 @@ RelativePath="..\..\..\..\src\mesa\main\depthstencil.c" > - - @@ -450,6 +470,10 @@ RelativePath="..\..\..\..\src\mesa\main\fog.c" > + + @@ -466,16 +490,20 @@ RelativePath="..\..\..\..\src\mesa\glapi\glapi.c" > + + @@ -858,6 +886,70 @@ RelativePath="..\..\..\..\src\mesa\main\shared.c" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -910,10 +1002,6 @@ RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.c" > - - @@ -1150,6 +1238,10 @@ RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c" > + + @@ -1171,10 +1263,6 @@ RelativePath="..\..\..\..\src\mesa\main\api_arrayelt.h" > - - @@ -1199,10 +1287,6 @@ RelativePath="..\..\..\..\src\mesa\shader\arbprogram.h" > - - @@ -1247,6 +1331,10 @@ RelativePath="..\..\..\..\src\mesa\main\colortab.h" > + + @@ -1323,6 +1411,10 @@ RelativePath="..\..\..\..\src\mesa\main\fog.h" > + + @@ -1359,22 +1451,6 @@ RelativePath="..\..\..\..\src\mesa\glapi\glthread.h" > - - - - - - - - @@ -1463,18 +1539,10 @@ RelativePath="..\..\..\..\src\mesa\main\macros.h" > - - - - @@ -1671,10 +1739,6 @@ RelativePath="..\..\..\..\src\mesa\swrast\s_points.h" > - - @@ -1731,14 +1795,246 @@ RelativePath="..\..\..\..\src\mesa\main\simple_list.h" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1759,10 +2055,106 @@ RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h" > + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1783,10 +2175,6 @@ RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.h" > - - @@ -1811,6 +2199,54 @@ RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.h" > + + + + + + + + + + + + + + @@ -1896,11 +2332,11 @@ >