summaryrefslogtreecommitdiff
path: root/windows
diff options
context:
space:
mode:
authorAlan Hourihane <alanh@vmware.com>2009-01-16 16:44:53 +0000
committerAlan Hourihane <alanh@vmware.com>2009-01-16 16:44:53 +0000
commit2e28c1fda24988241ef7abb91b7d896e38f5df26 (patch)
tree593e70705d1f60babd77697b75f7618a94c6703b /windows
parent47ca0234dc9f83808cb141944537c78eaade5d55 (diff)
parente442fe5ba53acf16c78339f19921d70dba3928f6 (diff)
Merge commit 'origin/master' into gallium-0.2
Conflicts: src/mesa/shader/slang/slang_compile.c
Diffstat (limited to 'windows')
-rw-r--r--windows/VC8/mesa/mesa/mesa.vcproj19
1 files changed, 18 insertions, 1 deletions
diff --git a/windows/VC8/mesa/mesa/mesa.vcproj b/windows/VC8/mesa/mesa/mesa.vcproj
index 13029af143..d67cbfe625 100644
--- a/windows/VC8/mesa/mesa/mesa.vcproj
+++ b/windows/VC8/mesa/mesa/mesa.vcproj
@@ -1,10 +1,11 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8,00"
+ Version="8.00"
Name="mesa"
ProjectGUID="{2120C974-2717-4709-B44F-D6E6D0A56448}"
RootNamespace="mesa"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -347,6 +348,22 @@
<File
RelativePath="..\..\..\..\src\mesa\glapi\glapi_getproc.c"
>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCLCompilerTool"
+ PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE"
+ />
+ </FileConfiguration>
</File>
<File
RelativePath="..\..\..\..\src\mesa\glapi\glthread.c"