From 0d6017eaee95de510cc427789a17ddc385f30f5b Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 29 Jul 2010 16:14:04 +0000 Subject: Solved build warnings --- mesalib/windows/VC8/mesa/makefile | 38 +++++- mesalib/windows/VC8/mesa/mesa/mesa.vcxproj | 207 ++++++++++++----------------- 2 files changed, 121 insertions(+), 124 deletions(-) (limited to 'mesalib/windows') diff --git a/mesalib/windows/VC8/mesa/makefile b/mesalib/windows/VC8/mesa/makefile index 48a5513cf..af644143d 100644 --- a/mesalib/windows/VC8/mesa/makefile +++ b/mesalib/windows/VC8/mesa/makefile @@ -5,14 +5,46 @@ else MHMAKESLNFILE=mesavc10.sln BUILDCMD=devenv.com $(MHMAKESLNFILE) /build endif -SLNFILE= + +DEPS:=$(wildcard ..\..\..\src\mesa\swrast\*.c) \ + $(wildcard ..\..\..\src\mesa\swrast\*.h) \ + $(wildcard ..\..\..\src\mesa\swrast_setup\*.c) \ + $(wildcard ..\..\..\src\mesa\swrast_setup\*.h) \ + $(wildcard ..\..\..\src\mesa\main\*.c) \ + $(wildcard ..\..\..\src\mesa\main\*.h) \ + $(wildcard ..\..\..\src\mesa\shader\*.c) \ + $(wildcard ..\..\..\src\mesa\shader\*.h) \ + $(wildcard ..\..\..\src\mesa\shader\slang\*.c) \ + $(wildcard ..\..\..\src\mesa\shader\slang\*.h) \ + $(wildcard ..\..\..\src\mesa\shader\slang\library\*.c) \ + $(wildcard ..\..\..\src\mesa\shader\slang\library\*.h) \ + $(wildcard ..\..\..\src\mesa\glapi\*.c) \ + $(wildcard ..\..\..\src\mesa\glapi\*.h) \ + $(wildcard ..\..\..\src\mesa\math\*.c) \ + $(wildcard ..\..\..\src\mesa\math\*.h) \ + $(wildcard ..\..\..\src\mesa\tnl\*.c) \ + $(wildcard ..\..\..\src\mesa\tnl\*.h) \ + $(wildcard ..\..\..\src\mesa\vbo\*.c) \ + $(wildcard ..\..\..\src\mesa\vbo\*.h) \ + $(wildcard ..\..\..\src\glsl\cl\*.c) \ + $(wildcard ..\..\..\src\glsl\cl\*.h) \ + $(wildcard ..\..\..\src\glsl\pp\*.c) \ + $(wildcard ..\..\..\src\glsl\pp\*.h) \ + $(wildcard ..\..\..\src\glsl\apps\*.c) \ + $(wildcard ..\..\..\src\glsl\apps\*.h) \ + $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.c) \ + $(wildcard ..\..\..\src\mesa\drivers\dri\swrast\*.h) \ + $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.c) \ + $(wildcard ..\..\..\src\mesa\drivers\dri\common\*.h) \ + $(wildcard ..\..\..\src\mesa\drivers\common\*.c) \ + $(wildcard ..\..\..\src\mesa\drivers\common\*.h) all: Release\swrast_dri.dll Debug\swrast_dri.dll -Debug\swrast_dri.dll: +Debug\swrast_dri.dll: $(DEPS) $(BUILDCMD) "Debug|Win32" -Release\swrast_dri.dll: +Release\swrast_dri.dll: $(DEPS) $(BUILDCMD) "Release|Win32" clean: cleanthis diff --git a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj index 6a0c990b7..42a0c1fb7 100644 --- a/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj +++ b/mesalib/windows/VC8/mesa/mesa/mesa.vcxproj @@ -67,7 +67,6 @@ <_ProjectFileVersion>10.0.30319.1 $(SolutionDir)$(Configuration)\ $(Configuration)\ - true $(SolutionDir)$(Configuration)\ $(Configuration)\ true @@ -77,17 +76,10 @@ $(SolutionDir)$(Configuration)\ $(Configuration)\ true + false + false - - - - - - - - %(Outputs) - /Zm1000 %(AdditionalOptions) AnySuitable @@ -114,15 +106,6 @@ - - - - - - - - %(Outputs) - /Zm1000 %(AdditionalOptions) Disabled @@ -146,15 +129,6 @@ - - - - - - - - %(Outputs) - /Zm1000 %(AdditionalOptions) Disabled @@ -178,15 +152,6 @@ - - - - - - - - %(Outputs) - /Zm1000 %(AdditionalOptions) AnySuitable @@ -596,94 +561,94 @@ - Building predefined shaders + Building slang_120_core_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h + Building slang_120_core_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h + Building slang_120_core_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h + Building slang_120_core_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h;%(Outputs) + ..\..\..\..\src\mesa\shader\slang\library\slang_120_core.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_120_core_gc.h - Building predefined shaders + Building slang_builtin_120_common_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h + Building slang_builtin_120_common_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h + Building slang_builtin_120_common_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h + Building slang_builtin_120_common_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h;%(Outputs) + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_common_gc.h - Building predefined shaders + Building slang_builtin_120_fragment_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h + Building slang_builtin_120_fragment_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h + Building slang_builtin_120_fragment_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h + Building slang_builtin_120_fragment_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h;%(Outputs) + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_builtin_120_fragment_gc.h - Building predefined shaders + Building slang_common_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h + Building slang_common_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h + Building slang_common_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h + Building slang_common_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h;%(Outputs) + ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_common_builtin_gc.h @@ -691,49 +656,49 @@ - Building predefined shaders + Building slang_core_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h + Building slang_core_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h + Building slang_core_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h + Building slang_core_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h;%(Outputs) + ..\..\..\..\src\mesa\shader\slang\library\slang_core.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_core_gc.h - Building predefined shaders + Building slang_fragment_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h + Building slang_fragment_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h + Building slang_fragment_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h + Building slang_fragment_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe fragment ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h;%(Outputs) + ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_fragment_builtin_gc.h @@ -747,26 +712,26 @@ - Building predefined shaders + Building slang_vertex_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h + Building slang_vertex_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h + Building slang_vertex_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h;%(Outputs) - Building predefined shaders + ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h + Building slang_vertex_builtin_gc.h ..\..\..\..\src\glsl\apps\compile.exe vertex ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h - ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc;%(AdditionalInputs) - ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h;%(Outputs) + ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin.gc + ..\..\..\..\src\mesa\shader\slang\library\slang_vertex_builtin_gc.h -- cgit v1.2.3