OSDN Git Service

(root) / android-x86 / external-mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b7f802e)
windows: updated VC8 project files
authorThomas Henn <thomas.henn@igd.fraunhofer.de>
Mon, 19 Jan 2009 15:23:22 +0000 (08:23 -0700)
committerBrian Paul <brianp@vmware.com>
Mon, 19 Jan 2009 15:23:22 +0000 (08:23 -0700)
windows/VC8/mesa/gdi/gdi.vcproj patch | blob | history
windows/VC8/mesa/glu/glu.vcproj patch | blob | history
windows/VC8/mesa/osmesa/osmesa.vcproj patch | blob | history
windows/VC8/progs/demos/gears.vcproj patch | blob | history
windows/VC8/progs/glut/glut.vcproj patch | blob | history

diff --git a/windows/VC8/mesa/gdi/gdi.vcproj b/windows/VC8/mesa/gdi/gdi.vcproj
index 7b3efc4..58d8ab1 100644 (file)
--- a/windows/VC8/mesa/gdi/gdi.vcproj
+++ b/windows/VC8/mesa/gdi/gdi.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="8,00"\r
        Name="gdi"\r
        ProjectGUID="{A1B24907-E196-4826-B6AF-26723629B633}"\r
+       RootNamespace="gdi"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -49,7 +50,7 @@
                                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
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/gdi.pch"\r
                                AssemblerListingLocation=".\Debug/"\r
                                ObjectFile=".\Debug/"\r
@@ -74,12 +75,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="mesa.lib msvcrtd.lib gdi32.lib user32.lib winmm.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
@@ -147,7 +146,7 @@
                                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
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/gdi.pch"\r
                                AssemblerListingLocation=".\Release/"\r
@@ -171,12 +170,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="mesa.lib winmm.lib gdi32.lib user32.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
diff --git a/windows/VC8/mesa/glu/glu.vcproj b/windows/VC8/mesa/glu/glu.vcproj
index 016b0b9..37d829e 100644 (file)
--- a/windows/VC8/mesa/glu/glu.vcproj
+++ b/windows/VC8/mesa/glu/glu.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="8,00"\r
        Name="glu"\r
        ProjectGUID="{2E50FDAF-430B-475B-AE6B-60B68F2875BA}"\r
+       RootNamespace="glu"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -47,9 +48,9 @@
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/glu.pch"\r
                                AssemblerListingLocation=".\Release/"\r
@@ -72,12 +73,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="msvcrt.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"\r
                                OutputFile="Release/GLU32.DLL"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="../gdi/Release"\r
-                               IgnoreAllDefaultLibraries="true"\r
                                ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"\r
                                ProgramDatabaseFile=".\Release/GLU32.pdb"\r
                                ImportLibrary=".\Release/GLU32.lib"\r
@@ -142,9 +141,9 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../../../include;../../../../src/glu/sgi/include;../../../../src/glu/sgi/libnurbs/interface;../../../../src/glu/sgi/libnurbs/internals;../../../../src/glu/sgi/libnurbs/nurbtess"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GL32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;GLU_EXPORTS;BUILD_GLU32;LIBRARYBUILD;_CRT_SECURE_NO_DEPRECATE"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/glu.pch"\r
                                AssemblerListingLocation=".\Debug/"\r
                                ObjectFile=".\Debug/"\r
@@ -167,12 +166,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="msvcrtd.lib winmm.lib odbc32.lib odbccp32.lib opengl32.lib"\r
                                OutputFile="Debug/GLU32.DLL"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="../gdi/Debug"\r
-                               IgnoreAllDefaultLibraries="true"\r
                                ModuleDefinitionFile="..\..\..\..\src\glu\sgi\glu.def"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile=".\Debug/GLU32.pdb"\r
@@ -418,11 +415,11 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\glimports.h"\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\glimports.h"\r
                                >\r
                        </File>\r
                        <File\r
@@ -518,19 +515,19 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdio.h"\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdio.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"\r
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\nurbtess\mystdlib.h"\r
+                               RelativePath="..\..\..\..\src\glu\sgi\libnurbs\interface\mystdlib.h"\r
                                >\r
                        </File>\r
                        <File\r
diff --git a/windows/VC8/mesa/osmesa/osmesa.vcproj b/windows/VC8/mesa/osmesa/osmesa.vcproj
index 2ba0077..07e2f43 100644 (file)
--- a/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ b/windows/VC8/mesa/osmesa/osmesa.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="8,00"\r
        Name="osmesa"\r
        ProjectGUID="{8D6CD423-383B-49E7-81BC-D20C70B07DF5}"\r
+       RootNamespace="osmesa"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -47,9 +48,9 @@
                                Name="VCCLCompilerTool"\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/osmesa.pch"\r
                                AssemblerListingLocation=".\Release/"\r
@@ -73,12 +74,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="opengl32.lib winmm.lib msvcrt.lib odbc32.lib odbccp32.lib"\r
                                OutputFile="Release/OSMESA32.DLL"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="../gdi/Release"\r
-                               IgnoreAllDefaultLibraries="true"\r
                                ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"\r
                                ProgramDatabaseFile=".\Release/OSMESA32.pdb"\r
                                ImportLibrary=".\Release/OSMESA32.lib"\r
@@ -143,9 +142,9 @@
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/main,../../../../src/mesa/glapi,../../../../src/mesa/swrast,../../../../src/mesa/shader"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS;BUILD_GL32"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/osmesa.pch"\r
                                AssemblerListingLocation=".\Debug/"\r
                                ObjectFile=".\Debug/"\r
@@ -169,12 +168,10 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="opengl32.lib winmm.lib msvcrtd.lib odbc32.lib odbccp32.lib"\r
                                OutputFile="Debug/OSMESA32.DLL"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="../gdi/Debug"\r
-                               IgnoreAllDefaultLibraries="true"\r
                                ModuleDefinitionFile="..\..\..\..\src\mesa\drivers\osmesa\osmesa.def"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile=".\Debug/OSMESA32.pdb"\r
@@ -215,10 +212,6 @@
                        Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"\r
                        >\r
                        <File\r
-                               RelativePath="..\..\..\..\src\mesa\drivers\common\driverfuncs.c"\r
-                               >\r
-                       </File>\r
-                       <File\r
                                RelativePath="..\..\..\..\src\mesa\drivers\osmesa\osmesa.c"\r
                                >\r
                        </File>\r
@@ -231,6 +224,10 @@
                        Name="Header Files"\r
                        Filter="h;hpp;hxx;hm;inl"\r
                        >\r
+                       <File\r
+                               RelativePath="..\..\..\..\include\gl\osmesa.h"\r
+                               >\r
+                       </File>\r
                </Filter>\r
                <Filter\r
                        Name="Resource Files"\r
diff --git a/windows/VC8/progs/demos/gears.vcproj b/windows/VC8/progs/demos/gears.vcproj
index 891acd6..4fac301 100644 (file)
--- a/windows/VC8/progs/demos/gears.vcproj
+++ b/windows/VC8/progs/demos/gears.vcproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="Windows-1252"?>\r
 <VisualStudioProject\r
        ProjectType="Visual C++"\r
-       Version="8.00"\r
+       Version="8,00"\r
        Name="gears"\r
        ProjectGUID="{3A7B0671-10F8-45D1-B012-F6D650F817CE}"\r
+       RootNamespace="gears"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -45,7 +46,7 @@
                                AdditionalIncludeDirectories="../../../../include"\r
                                PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/gears.pch"\r
                                AssemblerListingLocation=".\Debug/"\r
                                ObjectFile=".\Debug/"\r
@@ -69,7 +70,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"\r
                                OutputFile=".\Debug/gears.exe"\r
                                LinkIncremental="2"\r
                                SuppressStartupBanner="true"\r
@@ -136,7 +136,7 @@
                                AdditionalIncludeDirectories="../../../../include"\r
                                PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/gears.pch"\r
                                AssemblerListingLocation=".\Release/"\r
@@ -160,7 +160,6 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"\r
                                OutputFile=".\Release/gears.exe"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
diff --git a/windows/VC8/progs/glut/glut.vcproj b/windows/VC8/progs/glut/glut.vcproj
index 8d03c37..792490b 100644 (file)
--- a/windows/VC8/progs/glut/glut.vcproj
+++ b/windows/VC8/progs/glut/glut.vcproj
@@ -50,7 +50,7 @@
                                AdditionalIncludeDirectories="../../../../include"\r
                                PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32;_CRT_SECURE_NO_DEPRECATE"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="1"\r
+                               RuntimeLibrary="3"\r
                                PrecompiledHeaderFile=".\Debug/glut.pch"\r
                                AssemblerListingLocation=".\Debug/"\r
                                ObjectFile=".\Debug/"\r
@@ -74,12 +74,11 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="winmm.lib msvcrtd.lib gdi32.lib user32.lib oldnames.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib"\r
+                               AdditionalDependencies="winmm.lib opengl32.lib glu32.lib"\r
                                OutputFile="Debug/GLUT32.DLL"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="../../mesa/Debug"\r
-                               IgnoreAllDefaultLibraries="true"\r
                                ModuleDefinitionFile="..\..\..\..\src\glut\glx\glut.def"\r
                                GenerateDebugInformation="true"\r
                                ProgramDatabaseFile=".\Debug/GLUT32.pdb"\r
@@ -147,7 +146,7 @@
                                AdditionalIncludeDirectories="../../../../include"\r
                                PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32;_CRT_SECURE_NO_DEPRECATE"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="0"\r
+                               RuntimeLibrary="2"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/glut.pch"\r
                                AssemblerListingLocation=".\Release/"\r
@@ -171,12 +170,11 @@
                        <Tool\r
                                Name="VCLinkerTool"\r
                                AdditionalOptions="/MACHINE:I386"\r
-                               AdditionalDependencies="opengl32.lib glu32.lib user32.lib winmm.lib gdi32.lib msvcrt.lib oldnames.lib odbc32.lib odbccp32.lib"\r
+                               AdditionalDependencies="winmm.lib opengl32.lib glu32.lib"\r
                                OutputFile="Release/GLUT32.DLL"\r
                                LinkIncremental="1"\r
                                SuppressStartupBanner="true"\r
                                AdditionalLibraryDirectories="../../mesa/Release"\r
-                               IgnoreAllDefaultLibraries="true"\r
                                ModuleDefinitionFile="..\..\..\..\src\glut\glx\glut.def"\r
                                ProgramDatabaseFile=".\Release/GLUT32.pdb"\r
                                ImportLibrary=".\Release/GLUT32.lib"\r
external/mesa
About OSDN
Find Software
Develop Software
Help