OSDN Git Service

(root) / android-x86 / external-mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 437fa85)
windows: more VC8 project file updates
authorKarl Schultz <k.w.schultz@comcast.net>
Tue, 20 Jan 2009 15:58:40 +0000 (08:58 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 20 Jan 2009 16:07:01 +0000 (09:07 -0700)
Make some compiler flags per-file.
Remove driverfuncs.c from osmesa project.

windows/VC8/mesa/mesa/mesa.vcproj patch | blob | history
windows/VC8/mesa/osmesa/osmesa.vcproj patch | blob | history

diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index d67cbfe..f1ad7f6 100644 (file)
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -5,7 +5,6 @@
        Name="mesa"\r
        ProjectGUID="{2120C974-2717-4709-B44F-D6E6D0A56448}"\r
        RootNamespace="mesa"\r
-       TargetFrameworkVersion="131072"\r
        >\r
        <Platforms>\r
                <Platform\r
@@ -45,7 +44,7 @@
                                AdditionalOptions="/Zm1000 "\r
                                InlineFunctionExpansion="1"\r
                                AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"\r
-                               PreprocessorDefinitions="NDEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;NDEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN"\r
                                StringPooling="true"\r
                                RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
@@ -120,7 +119,7 @@
                                AdditionalOptions="/Zm1000 "\r
                                Optimization="0"\r
                                AdditionalIncludeDirectories="../../../../include,../../../../src/mesa,../../../../src/mesa/glapi,../../../../src/mesa/main,../../../../src/mesa/shader,../../../../src/mesa/shader/slang,../../../../src/mesa/shader/grammar"\r
-                               PreprocessorDefinitions="_DEBUG,WIN32,_LIB,_DLL,BUILD_GL32,MESA_MINWARN"\r
+                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;_DEBUG;WIN32;_LIB;_DLL;BUILD_GL32;MESA_MINWARN"\r
                                BasicRuntimeChecks="3"\r
                                RuntimeLibrary="1"\r
                                PrecompiledHeaderFile=".\Debug/mesa.pch"\r
@@ -328,42 +327,10 @@
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\glapi\glapi.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\glapi\glthread.c"\r
@@ -398,7 +365,6 @@
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
                                        />\r
                                </FileConfiguration>\r
                                <FileConfiguration\r
@@ -407,7 +373,6 @@
                                        >\r
                                        <Tool\r
                                                Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
                                        />\r
                                </FileConfiguration>\r
                        </File>\r
@@ -434,22 +399,6 @@
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\main\imports.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\main\light.c"\r
@@ -562,22 +511,6 @@
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\prog_print.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\prog_statevars.c"\r
@@ -750,22 +683,6 @@
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_codegen.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_compile.c"\r
@@ -790,42 +707,10 @@
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_emit.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_ir.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_label.c"\r
@@ -850,22 +735,6 @@
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_print.c"\r
                                >\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"\r
-                                       />\r
-                               </FileConfiguration>\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\..\..\src\mesa\shader\slang\slang_simplify.c"\r
diff --git a/windows/VC8/mesa/osmesa/osmesa.vcproj b/windows/VC8/mesa/osmesa/osmesa.vcproj
index 07e2f43..cbf66df 100644 (file)
--- a/windows/VC8/mesa/osmesa/osmesa.vcproj
+++ b/windows/VC8/mesa/osmesa/osmesa.vcproj
@@ -1,10 +1,9 @@
 <?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
@@ -48,9 +47,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;BUILD_GL32"\r
+                               PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"\r
                                StringPooling="true"\r
-                               RuntimeLibrary="2"\r
+                               RuntimeLibrary="0"\r
                                EnableFunctionLevelLinking="true"\r
                                PrecompiledHeaderFile=".\Release/osmesa.pch"\r
                                AssemblerListingLocation=".\Release/"\r
@@ -74,10 +73,12 @@
                        <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
@@ -142,9 +143,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;BUILD_GL32"\r
+                               PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;OSMESA_EXPORTS"\r
                                BasicRuntimeChecks="3"\r
-                               RuntimeLibrary="3"\r
+                               RuntimeLibrary="1"\r
                                PrecompiledHeaderFile=".\Debug/osmesa.pch"\r
                                AssemblerListingLocation=".\Debug/"\r
                                ObjectFile=".\Debug/"\r
@@ -168,10 +169,12 @@
                        <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
@@ -224,10 +227,6 @@
                        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
external/mesa
About OSDN
Find Software
Develop Software
Help