OSDN Git Service

(root) / android-x86 / external-mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1a15b21)
updated VC7 project files
authorChristoph Kubisch <crazybutcher@gmx.de>
Wed, 5 Sep 2007 16:03:08 +0000 (10:03 -0600)
committerBrian <brian.paul@tungstengraphics.com>
Wed, 5 Sep 2007 16:04:37 +0000 (10:04 -0600)
windows/VC7/mesa/gdi/gdi.vcproj patch | blob | history
windows/VC7/mesa/glu/glu.vcproj patch | blob | history
windows/VC7/mesa/mesa.sln patch | blob | history
windows/VC7/mesa/mesa/mesa.vcproj patch | blob | history
windows/VC7/mesa/osmesa/osmesa.vcproj patch | blob | history

diff --git a/windows/VC7/mesa/gdi/gdi.vcproj b/windows/VC7/mesa/gdi/gdi.vcproj
index 82de75d..0dc7892 100644 (file)
--- a/windows/VC7/mesa/gdi/gdi.vcproj
+++ b/windows/VC7/mesa/gdi/gdi.vcproj
@@ -1,181 +1,195 @@
-<?xml version="1.0" encoding = "Windows-1252"?>
-<VisualStudioProject
-       ProjectType="Visual C++"
-       Version="7.00"
-       Name="gdi"
-       SccProjectName=""
-       SccLocalPath="">
-       <Platforms>
-               <Platform
-                       Name="Win32"/>
-       </Platforms>
-       <Configurations>
-               <Configuration
-                       Name="Debug|Win32"
-                       OutputDirectory=".\Debug"
-                       IntermediateDirectory=".\Debug"
-                       ConfigurationType="2"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               Optimization="0"
-                               AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
-                               BasicRuntimeChecks="3"
-                               RuntimeLibrary="1"
-                               PrecompiledHeaderFile=".\Debug/gdi.pch"
-                               AssemblerListingLocation=".\Debug/"
-                               ObjectFile=".\Debug/"
-                               ProgramDataBaseFileName=".\Debug/"
-                               BrowseInformation="1"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               DebugInformationFormat="3"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions="/MACHINE:I386"
-                               AdditionalDependencies="mesa.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"
-                               OutputFile="Debug/OPENGL32.DLL"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="../mesa/Debug"
-                               IgnoreAllDefaultLibraries="TRUE"
-                               ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-                               GenerateDebugInformation="TRUE"
-                               ProgramDatabaseFile=".\Debug/OPENGL32.pdb"
-                               ImportLibrary=".\Debug/OPENGL32.lib"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               MkTypLibCompatible="TRUE"
-                               SuppressStartupBanner="TRUE"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\Debug/gdi.tlb"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Debug\OPENGL32.LIB ..\..\..\..\lib
-copy Debug\OPENGL32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="_DEBUG"
-                               Culture="1033"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-               </Configuration>
-               <Configuration
-                       Name="Release|Win32"
-                       OutputDirectory=".\Release"
-                       IntermediateDirectory=".\Release"
-                       ConfigurationType="2"
-                       UseOfMFC="0"
-                       ATLMinimizesCRunTimeLibraryUsage="FALSE"
-                       CharacterSet="2">
-                       <Tool
-                               Name="VCCLCompilerTool"
-                               InlineFunctionExpansion="1"
-                               AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"
-                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"
-                               StringPooling="TRUE"
-                               RuntimeLibrary="0"
-                               EnableFunctionLevelLinking="TRUE"
-                               PrecompiledHeaderFile=".\Release/gdi.pch"
-                               AssemblerListingLocation=".\Release/"
-                               ObjectFile=".\Release/"
-                               ProgramDataBaseFileName=".\Release/"
-                               WarningLevel="3"
-                               SuppressStartupBanner="TRUE"
-                               CompileAs="0"/>
-                       <Tool
-                               Name="VCCustomBuildTool"/>
-                       <Tool
-                               Name="VCLinkerTool"
-                               AdditionalOptions="/MACHINE:I386"
-                               AdditionalDependencies="mesa.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"
-                               OutputFile="Release/OPENGL32.DLL"
-                               LinkIncremental="1"
-                               SuppressStartupBanner="TRUE"
-                               AdditionalLibraryDirectories="../mesa/Release"
-                               IgnoreAllDefaultLibraries="TRUE"
-                               ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"
-                               ProgramDatabaseFile=".\Release/OPENGL32.pdb"
-                               ImportLibrary=".\Release/OPENGL32.lib"/>
-                       <Tool
-                               Name="VCMIDLTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               MkTypLibCompatible="TRUE"
-                               SuppressStartupBanner="TRUE"
-                               TargetEnvironment="1"
-                               TypeLibraryName=".\Release/gdi.tlb"/>
-                       <Tool
-                               Name="VCPostBuildEventTool"
-                               CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib
-copy Release\OPENGL32.LIB ..\..\..\..\lib
-copy Release\OPENGL32.DLL ..\..\..\..\lib
-if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos
-"/>
-                       <Tool
-                               Name="VCPreBuildEventTool"/>
-                       <Tool
-                               Name="VCPreLinkEventTool"/>
-                       <Tool
-                               Name="VCResourceCompilerTool"
-                               PreprocessorDefinitions="NDEBUG"
-                               Culture="1033"/>
-                       <Tool
-                               Name="VCWebServiceProxyGeneratorTool"/>
-                       <Tool
-                               Name="VCWebDeploymentTool"/>
-               </Configuration>
-       </Configurations>
-       <Files>
-               <Filter
-                       Name="Source Files"
-                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
-                       <File
-                               RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def">
-                       </File>
-                       <File
-                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c">
-                       </File>
-                       <File
-                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Header Files"
-                       Filter="h;hpp;hxx;hm;inl">
-                       <File
-                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h">
-                       </File>
-                       <File
-                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h">
-                       </File>
-               </Filter>
-               <Filter
-                       Name="Resource Files"
-                       Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
-               </Filter>
-       </Files>
-       <Globals>
-       </Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>\r
+<VisualStudioProject\r
+       ProjectType="Visual C++"\r
+       Version="7.10"\r
+       Name="gdi"\r
+       SccProjectName=""\r
+       SccLocalPath="">\r
+       <Platforms>\r
+               <Platform\r
+                       Name="Win32"/>\r
+       </Platforms>\r
+       <Configurations>\r
+               <Configuration\r
+                       Name="Debug|Win32"\r
+                       OutputDirectory=".\Debug"\r
+                       IntermediateDirectory=".\Debug"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               Optimization="0"\r
+                               AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"\r
+                               PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"\r
+                               BasicRuntimeChecks="3"\r
+                               RuntimeLibrary="1"\r
+                               PrecompiledHeaderFile=".\Debug/gdi.pch"\r
+                               AssemblerListingLocation=".\Debug/"\r
+                               ObjectFile=".\Debug/"\r
+                               ProgramDataBaseFileName=".\Debug/"\r
+                               BrowseInformation="1"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               DebugInformationFormat="3"\r
+                               CompileAs="0"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions="/MACHINE:I386"\r
+                               AdditionalDependencies="mesa.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"\r
+                               OutputFile="Debug/OPENGL32.DLL"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="../mesa/Debug"\r
+                               IgnoreAllDefaultLibraries="TRUE"\r
+                               ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"\r
+                               GenerateDebugInformation="TRUE"\r
+                               ProgramDatabaseFile=".\Debug/OPENGL32.pdb"\r
+                               ImportLibrary=".\Debug/OPENGL32.lib"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               MkTypLibCompatible="TRUE"\r
+                               SuppressStartupBanner="TRUE"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\Debug/gdi.tlb"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib\r
+copy Debug\OPENGL32.LIB ..\..\..\..\lib\r
+copy Debug\OPENGL32.DLL ..\..\..\..\lib\r
+if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos\r
+"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="_DEBUG"\r
+                               Culture="1033"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+               <Configuration\r
+                       Name="Release|Win32"\r
+                       OutputDirectory=".\Release"\r
+                       IntermediateDirectory=".\Release"\r
+                       ConfigurationType="2"\r
+                       UseOfMFC="0"\r
+                       ATLMinimizesCRunTimeLibraryUsage="FALSE"\r
+                       CharacterSet="2">\r
+                       <Tool\r
+                               Name="VCCLCompilerTool"\r
+                               InlineFunctionExpansion="1"\r
+                               AdditionalIncludeDirectories="../../main,../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"\r
+                               PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_USRDLL;GDI_EXPORTS;_DLL;BUILD_GL32;MESA_MINWARN"\r
+                               StringPooling="TRUE"\r
+                               RuntimeLibrary="0"\r
+                               EnableFunctionLevelLinking="TRUE"\r
+                               PrecompiledHeaderFile=".\Release/gdi.pch"\r
+                               AssemblerListingLocation=".\Release/"\r
+                               ObjectFile=".\Release/"\r
+                               ProgramDataBaseFileName=".\Release/"\r
+                               WarningLevel="3"\r
+                               SuppressStartupBanner="TRUE"\r
+                               CompileAs="0"/>\r
+                       <Tool\r
+                               Name="VCCustomBuildTool"/>\r
+                       <Tool\r
+                               Name="VCLinkerTool"\r
+                               AdditionalOptions="/MACHINE:I386"\r
+                               AdditionalDependencies="mesa.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"\r
+                               OutputFile="Release/OPENGL32.DLL"\r
+                               LinkIncremental="1"\r
+                               SuppressStartupBanner="TRUE"\r
+                               AdditionalLibraryDirectories="../mesa/Release"\r
+                               IgnoreAllDefaultLibraries="TRUE"\r
+                               ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def"\r
+                               ProgramDatabaseFile=".\Release/OPENGL32.pdb"\r
+                               ImportLibrary=".\Release/OPENGL32.lib"/>\r
+                       <Tool\r
+                               Name="VCMIDLTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               MkTypLibCompatible="TRUE"\r
+                               SuppressStartupBanner="TRUE"\r
+                               TargetEnvironment="1"\r
+                               TypeLibraryName=".\Release/gdi.tlb"/>\r
+                       <Tool\r
+                               Name="VCPostBuildEventTool"\r
+                               CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib\r
+copy Release\OPENGL32.LIB ..\..\..\..\lib\r
+copy Release\OPENGL32.DLL ..\..\..\..\lib\r
+if exist ..\..\..\..\progs\demos copy Release\OPENGL32.DLL ..\..\..\..\progs\demos\r
+"/>\r
+                       <Tool\r
+                               Name="VCPreBuildEventTool"/>\r
+                       <Tool\r
+                               Name="VCPreLinkEventTool"/>\r
+                       <Tool\r
+                               Name="VCResourceCompilerTool"\r
+                               PreprocessorDefinitions="NDEBUG"\r
+                               Culture="1033"/>\r
+                       <Tool\r
+                               Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
+               </Configuration>\r
+       </Configurations>\r
+       <References>\r
+       </References>\r
+       <Files>\r
+               <Filter\r
+                       Name="Source Files"\r
+                       Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\mesa.def">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wgl.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesa.c">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Header Files"\r
+                       Filter="h;hpp;hxx;hm;inl">\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\colors.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\drivers\windows\gdi\wmesadef.h">\r
+                       </File>\r
+               </Filter>\r
+               <Filter\r
+                       Name="Resource Files"\r
+                       Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">\r
+               </Filter>\r
+       </Files>\r
+       <Globals>\r
+       </Globals>\r
+</VisualStudioProject>\r
diff --git a/windows/VC7/mesa/glu/glu.vcproj b/windows/VC7/mesa/glu/glu.vcproj
index e0c481e..3f05731 100644 (file)
--- a/windows/VC7/mesa/glu/glu.vcproj
+++ b/windows/VC7/mesa/glu/glu.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.00"\r
+       Version="7.10"\r
        Name="glu"\r
        SccProjectName=""\r
        SccLocalPath="">\r
@@ -71,7 +71,13 @@ if exist ..\..\..\..\progs\demos copy Release\GLU32.DLL ..\..\..\..\progs\demos
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
                                Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
@@ -135,9 +141,17 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
                                Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
        </Configurations>\r
+       <References>\r
+       </References>\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
@@ -231,6 +245,9 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.h">\r
                        </File>\r
                        <File\r
@@ -240,9 +257,6 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bezierarc.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\bin.h">\r
                        </File>\r
                        <File\r
@@ -297,10 +311,10 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.h">\r
@@ -315,9 +329,6 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\include\gluos.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridline.h">\r
                        </File>\r
                        <File\r
@@ -327,6 +338,9 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\gridvertex.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\hull.h">\r
                        </File>\r
                        <File\r
@@ -357,10 +371,10 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.h">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\myassert.h">\r
@@ -372,18 +386,18 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mysetjmp.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mystring.h">\r
                        </File>\r
                        <File\r
@@ -459,10 +473,10 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.h">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.h">\r
@@ -517,9 +531,6 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                        Name="C++ files"\r
                        Filter=".cc">\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libtess\README">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc">\r
                        </File>\r
                        <File\r
@@ -634,13 +645,13 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc">\r
@@ -682,6 +693,9 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libtess\README">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc">\r
                        </File>\r
                        <File\r
@@ -700,10 +714,10 @@ if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc">\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc">\r
diff --git a/windows/VC7/mesa/mesa.sln b/windows/VC7/mesa/mesa.sln
index ada5568..ae47790 100644 (file)
--- a/windows/VC7/mesa/mesa.sln
+++ b/windows/VC7/mesa/mesa.sln
@@ -1,20 +1,26 @@
-Microsoft Visual Studio Solution File, Format Version 7.00\r
+Microsoft Visual Studio Solution File, Format Version 8.00\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gdi", "gdi\gdi.vcproj", "{A1B24907-E196-4826-B6AF-26723629B633}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {2120C974-2717-4709-B44F-D6E6D0A56448} = {2120C974-2717-4709-B44F-D6E6D0A56448}\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glu", "glu\glu.vcproj", "{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mesa", "mesa\mesa.vcproj", "{2120C974-2717-4709-B44F-D6E6D0A56448}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+       EndProjectSection\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "osmesa", "osmesa\osmesa.vcproj", "{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"\r
+       ProjectSection(ProjectDependencies) = postProject\r
+               {A1B24907-E196-4826-B6AF-26723629B633} = {A1B24907-E196-4826-B6AF-26723629B633}\r
+       EndProjectSection\r
 EndProject\r
 Global\r
        GlobalSection(SolutionConfiguration) = preSolution\r
-               ConfigName.0 = Debug\r
-               ConfigName.1 = Release\r
-       EndGlobalSection\r
-       GlobalSection(ProjectDependencies) = postSolution\r
-               {A1B24907-E196-4826-B6AF-26723629B633}.0 = {2120C974-2717-4709-B44F-D6E6D0A56448}\r
-               {8D6CD423-383B-49E7-81BC-D20C70B07DF5}.0 = {A1B24907-E196-4826-B6AF-26723629B633}\r
+               Debug = Debug\r
+               Release = Release\r
        EndGlobalSection\r
        GlobalSection(ProjectConfiguration) = postSolution\r
                {A1B24907-E196-4826-B6AF-26723629B633}.Debug.ActiveCfg = Debug|Win32\r
diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index 668c6fb..8a68258 100644 (file)
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ b/windows/VC7/mesa/mesa/mesa.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.00"\r
+       Version="7.10"\r
        Name="mesa"\r
        SccProjectName=""\r
        SccLocalPath="">\r
@@ -55,6 +55,12 @@
                                Culture="1033"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
@@ -101,19 +107,21 @@
                                Culture="1033"/>\r
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
        </Configurations>\r
+       <References>\r
+       </References>\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\array_cache\ac_context.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\array_cache\ac_import.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\main\accum.c">\r
                        </File>\r
                        <File\r
@@ -129,15 +137,15 @@
                                RelativePath="..\..\..\..\src\mesa\main\api_validate.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\arrayobj.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\arbprogparse.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\arbprogram.c">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\main\arrayobj.c">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\atifragshader.c">\r
                        </File>\r
                        <File\r
@@ -237,6 +245,15 @@
                                </FileConfiguration>\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.c">\r
+                               <FileConfiguration\r
+                                       Name="Debug|Win32"\r
+                                       ExcludedFromBuild="TRUE">\r
+                                       <Tool\r
+                                               Name="VCCLCompilerTool"/>\r
+                               </FileConfiguration>\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c">\r
                        </File>\r
                        <File\r
@@ -300,15 +317,9 @@
                                RelativePath="..\..\..\..\src\mesa\shader\nvprogram.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\nvvertexec.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\occlude.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\main\pixel.c">\r
                        </File>\r
                        <File\r
@@ -318,9 +329,33 @@
                                RelativePath="..\..\..\..\src\mesa\main\polygon.c">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_debug.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_execute.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_print.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.c">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\program.c">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\programopt.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\main\queryobj.c">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\main\rastpos.c">\r
                        </File>\r
                        <File\r
@@ -342,9 +377,6 @@
                                RelativePath="..\..\..\..\src\mesa\swrast\s_alpha.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\swrast\s_arbshader.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\swrast\s_atifragshader.c">\r
                        </File>\r
                        <File\r
@@ -378,6 +410,9 @@
                                RelativePath="..\..\..\..\src\mesa\swrast\s_fog.c">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.c">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\swrast\s_imaging.c">\r
                        </File>\r
                        <File\r
@@ -390,9 +425,6 @@
                                RelativePath="..\..\..\..\src\mesa\swrast\s_masking.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\swrast\s_nvfragprog.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\swrast\s_points.c">\r
                        </File>\r
                        <File\r
@@ -420,28 +452,16 @@
                                RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\shaderobjects.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_analyse.c">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\shader_api.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble.c">\r
+                               RelativePath="..\..\..\..\src\mesa\main\shaders.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.c">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.c">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c">\r
@@ -459,33 +479,48 @@
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute.c">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute_x86.c">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_export.c">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_texsample.c">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.c">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.c">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.c">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.c">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.c">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.c">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.c">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.c">\r
                        </File>\r
                        <File\r
@@ -498,13 +533,10 @@
                                RelativePath="..\..\..\..\src\mesa\main\stencil.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_array_api.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_array_import.c">\r
+                               RelativePath="..\..\..\..\src\mesa\tnl\t_context.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_context.c">\r
+                               RelativePath="..\..\..\..\src\mesa\tnl\t_draw.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.c">\r
@@ -549,18 +581,6 @@
                                RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_api.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_eval.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_exec.c">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_generic.c">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\main\texcompress.c">\r
                        </File>\r
                        <File\r
@@ -594,6 +614,48 @@
                                RelativePath="..\..\..\..\src\mesa\main\varray.c">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_api.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_array.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_draw.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec_eval.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_rebase.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_api.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_draw.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_save_loopback.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_copy.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_split_inplace.c">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c">\r
                                <FileConfiguration\r
                                        Name="Release|Win32"\r
@@ -751,6 +813,9 @@
                                RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h">\r
                        </File>\r
                        <File\r
@@ -835,9 +900,6 @@
                                RelativePath="..\..\..\..\src\mesa\shader\nvfragparse.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\nvfragprog.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\nvprogram.h">\r
                        </File>\r
                        <File\r
@@ -847,28 +909,43 @@
                                RelativePath="..\..\..\..\src\mesa\shader\nvvertparse.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\nvvertprog.h">\r
+                               RelativePath="..\..\..\..\src\mesa\main\pixel.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\occlude.h">\r
+                               RelativePath="..\..\..\..\src\mesa\main\points.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\pixel.h">\r
+                               RelativePath="..\..\..\..\src\mesa\main\polygon.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\points.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_debug.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\polygon.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_execute.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_instruction.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_parameter.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_print.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\program.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\rastpos.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\programopt.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\rbadaptors.h">\r
+                               RelativePath="..\..\..\..\src\mesa\main\queryobj.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\main\rastpos.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h">\r
@@ -913,6 +990,9 @@
                                RelativePath="..\..\..\..\src\mesa\swrast\s_fog.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\swrast\s_fragprog.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\swrast\s_lines.h">\r
                        </File>\r
                        <File\r
@@ -961,48 +1041,78 @@
                                RelativePath="..\..\..\..\src\mesa\swrast\s_zoom.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\shaderobjects.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\shader_api.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\shaderobjects_3dlabs.h">\r
+                               RelativePath="..\..\..\..\src\mesa\main\shaders.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\main\simple_list.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_builtin.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_function.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_operation.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_struct.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile_variable.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_execute.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_library_noise.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mesa.h">\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_link.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_log.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_mem.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_preprocess.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_storage.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_typeinfo.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_utility.h">\r
                        </File>\r
                        <File\r
+                               RelativePath="..\..\..\..\src\mesa\shader\slang\slang_vartable.h">\r
+                       </File>\r
+                       <File\r
                                RelativePath="..\..\..\..\src\mesa\swrast_setup\ss_context.h">\r
                        </File>\r
                        <File\r
@@ -1027,24 +1137,12 @@
                                RelativePath="..\..\..\..\src\mesa\swrast_setup\swrast_setup.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_array_api.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_array_import.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\tnl\t_context.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\tnl\t_pipeline.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_save_api.h">\r
-                       </File>\r
-                       <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_vb_arbprogram.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\tnl\t_vb_cliptmp.h">\r
                        </File>\r
                        <File\r
@@ -1060,9 +1158,6 @@
                                RelativePath="..\..\..\..\src\mesa\tnl\t_vp_build.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\tnl\t_vtx_api.h">\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\main\texcompress.h">\r
                        </File>\r
                        <File\r
@@ -1093,10 +1188,28 @@
                                RelativePath="..\..\..\..\src\mesa\tnl\tnl.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\shader\slang\traverse_wrap.h">\r
+                               RelativePath="..\..\..\..\src\mesa\main\varray.h">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\main\varray.h">\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_attrib_tmp.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_context.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_exec.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_save.h">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\..\..\src\mesa\vbo\vbo_split.h">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\main\version.h">\r
diff --git a/windows/VC7/mesa/osmesa/osmesa.vcproj b/windows/VC7/mesa/osmesa/osmesa.vcproj
index 266aff5..553dad7 100644 (file)
--- a/windows/VC7/mesa/osmesa/osmesa.vcproj
+++ b/windows/VC7/mesa/osmesa/osmesa.vcproj
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding = "Windows-1252"?>\r
+<?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="7.00"\r
+       Version="7.10"\r
        Name="osmesa"\r
        SccProjectName=""\r
        SccLocalPath="">\r
@@ -72,7 +72,13 @@ if exist ..\..\..\..\progs\demos copy Release\OSMESA32.DLL ..\..\..\..\progs\dem
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
                                Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
                <Configuration\r
                        Name="Debug|Win32"\r
@@ -137,9 +143,17 @@ if exist ..\..\..\..\progs\demos copy Debug\OSMESA32.DLL ..\..\..\..\progs\demos
                        <Tool\r
                                Name="VCWebServiceProxyGeneratorTool"/>\r
                        <Tool\r
+                               Name="VCXMLDataGeneratorTool"/>\r
+                       <Tool\r
                                Name="VCWebDeploymentTool"/>\r
+                       <Tool\r
+                               Name="VCManagedWrapperGeneratorTool"/>\r
+                       <Tool\r
+                               Name="VCAuxiliaryManagedWrapperGeneratorTool"/>\r
                </Configuration>\r
        </Configurations>\r
+       <References>\r
+       </References>\r
        <Files>\r
                <Filter\r
                        Name="Source Files"\r
external/mesa
About OSDN
Find Software
Develop Software
Help