diff options
| author | marha <marha@users.sourceforge.net> | 2009-12-22 18:18:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-12-22 18:18:58 +0000 |
| commit | 3b79162ea5c5be078326f2e0ea85b0f84c02f166 (patch) | |
| tree | 6826d1ef026f16ec12d35ee6bd4a892d0a05b7e0 /mesalib/windows/VC8 | |
| parent | 4284aeba874b9168f2228c59639bec8346a56796 (diff) | |
| parent | b729d9e1cc1c60e415da24143cabcbaccb525ed7 (diff) | |
| download | vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.tar.gz vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.tar.bz2 vcxsrv-3b79162ea5c5be078326f2e0ea85b0f84c02f166.zip | |
svn merge ^/branches/released
Diffstat (limited to 'mesalib/windows/VC8')
| -rw-r--r-- | mesalib/windows/VC8/mesa/mesa/mesa.vcproj | 190 |
1 files changed, 91 insertions, 99 deletions
diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj index 7ce4e1385..330cd26f4 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcproj @@ -125,7 +125,7 @@ WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
- CompileAs="0"
+ CompileAs="1"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
@@ -483,106 +483,74 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.c"
+ RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\main\hash.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\shader\hash_table.c"
>
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug Static CRT|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release Static CRT|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_crt.c"
+ RelativePath="..\..\..\..\src\mesa\main\hint.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\main\histogram.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\main\image.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\main\imports.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\shader\lex.yy.c"
>
<FileConfiguration
Name="Release|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
/>
</FileConfiguration>
<FileConfiguration
Name="Debug Static CRT|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
/>
</FileConfiguration>
<FileConfiguration
Name="Release Static CRT|Win32"
- ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
+ PreprocessorDefinitions="YY_NO_UNISTD_H;YY_USE_CONST;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE"
/>
</FileConfiguration>
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\hash.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\shader\hash_table.c"
>
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\hint.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\histogram.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\image.c"
- >
- </File>
- <File
- RelativePath="..\..\..\..\src\mesa\main\imports.c"
- >
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\shader\lex.yy.c"
>
<FileConfiguration
@@ -749,6 +717,38 @@ <File
RelativePath="..\..\..\..\src\mesa\shader\program_parse.tab.c"
>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug Static CRT|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release Static CRT|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="YYMALLOC=malloc;YYFREE=free"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\src\mesa\shader\program_parse_extra.c"
@@ -1015,6 +1015,14 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\symbol_table.c"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\main\syncobj.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\tnl\t_context.c"
>
</File>
@@ -1203,42 +1211,6 @@ >
</File>
<File
- RelativePath="..\..\..\..\src\mesa\main\vsnprintf.c"
- >
- <FileConfiguration
- Name="Release|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug Static CRT|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Release Static CRT|Win32"
- ExcludedFromBuild="true"
- >
- <Tool
- Name="VCCLCompilerTool"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath="..\..\..\..\src\mesa\main\vtxfmt.c"
>
</File>
@@ -1464,6 +1436,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\hash_table.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\hint.h"
>
</File>
@@ -1624,6 +1600,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\prog_parameter_layout.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\prog_print.h"
>
</File>
@@ -1640,6 +1620,10 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\program_parse.tab.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\programopt.h"
>
</File>
@@ -1912,6 +1896,14 @@ >
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\symbol_table.h"
+ >
+ </File>
+ <File
+ RelativePath="..\..\..\..\src\mesa\main\syncobj.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\tnl\t_context.h"
>
</File>
|