summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2009-11-04 17:57:20 -0700
committerBrian Paul <brianp@vmware.com>2009-11-04 17:57:20 -0700
commit898de4a9d5e47ed32c600e5907476fd9338aa7e9 (patch)
treeb06ee62e20bbf0cc5dbfd55b8315c4c409eb45ec /windows
parentfe86f8d73268785b31bc8d5a278a233bff42034d (diff)
parent1c3f7ab74ce492d6c92f2e3a0f29957fa9a71d96 (diff)
Merge branch 'mesa_7_6_branch'
Conflicts: src/mesa/drivers/windows/gdi/mesa.def
Diffstat (limited to 'windows')
-rw-r--r--windows/VC8/mesa/mesa/mesa.vcproj202
1 files changed, 103 insertions, 99 deletions
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index efbfae167fe..993c28ddc17 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -122,7 +122,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
- CompileAs="0"
+ CompileAs="1"
ForcedIncludeFiles="../../../../src/mesa/main/compiler.h"
/>
<Tool
@@ -475,102 +475,70 @@
>
</File>
<File
- RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar.c"
+ RelativePath="..\..\..\..\src\mesa\shader\grammar\grammar_mesa.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\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
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\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\main\light.c"
>
</File>
@@ -679,6 +647,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\prog_parameter_layout.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\prog_print.c"
>
</File>
@@ -695,6 +667,46 @@
>
</File>
<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"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\programopt.c"
>
</File>
@@ -943,6 +955,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>
@@ -1135,42 +1155,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>
@@ -1396,6 +1380,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\hash_table.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\main\hint.h"
>
</File>
@@ -1556,6 +1544,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\prog_parameter_layout.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\prog_print.h"
>
</File>
@@ -1572,6 +1564,10 @@
>
</File>
<File
+ RelativePath="..\..\..\..\src\mesa\shader\program_parse.tab.h"
+ >
+ </File>
+ <File
RelativePath="..\..\..\..\src\mesa\shader\programopt.h"
>
</File>
@@ -1848,6 +1844,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>