Account for moved/new/removed files.

diff --git a/windows/VC6/mesa/mesa/mesa.dsp b/windows/VC6/mesa/mesa/mesa.dsp
index c2c4f235ee4a02b27c3dcdd1f47bba7c5bf48efe..a98538ce88caf02046af3f458a156366ddf3ecd5 100644 (file)
--- a/windows/VC6/mesa/mesa/mesa.dsp
+++ b/windows/VC6/mesa/mesa/mesa.dsp
@@ -41,7 +41,7 @@ RSC=rc.exe
 # PROP Intermediate_Dir "Release"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c\r
-# ADD CPP /nologo /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /YX /FD /Zm1000 /c\r
+# ADD CPP /nologo /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /YX /FD /Zm1000 /c\r
 # ADD BASE RSC /l 0x409 /d "NDEBUG"\r
 # ADD RSC /l 0x409 /d "NDEBUG"\r
 BSC32=bscmake.exe\r
@@ -64,7 +64,7 @@ LIB32=link.exe -lib
 # PROP Intermediate_Dir "Debug"\r
 # PROP Target_Dir ""\r
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c\r
-# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /Fr /FD /GZ /Zm1000 /c\r
+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/main" /I "../../../../src/mesa/shader" /I "../../../../src/mesa/shader/slang" /I "../../../../src/mesa/shader/grammar" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "_LIB" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /Fr /FD /GZ /Zm1000 /c\r
 # ADD BASE RSC /l 0x409 /d "_DEBUG"\r
 # ADD RSC /l 0x409 /d "_DEBUG"\r
 BSC32=bscmake.exe\r
@@ -233,12 +233,12 @@ SOURCE=..\..\..\..\src\mesa\glapi\glthread.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\grammar.c\r
+SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar.c\r
 # PROP Exclude_From_Build 1\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\grammar_mesa.c\r
+SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar_mesa.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -474,7 +474,7 @@ SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble.h\r
+SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.c\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -482,26 +482,14 @@ SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.c\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile.c\r
 # End Source File\r
 # Begin Source File\r
@@ -510,10 +498,6 @@ SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\..\..\src\mesa\shader\slang\slang_preprocess.c\r
 # End Source File\r
 # Begin Source File\r
@@ -522,10 +506,6 @@ SOURCE=..\..\..\..\src\mesa\shader\slang\slang_storage.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\slang\slang_storage.h\r
-# End Source File\r
-# Begin Source File\r
-\r
 SOURCE=..\..\..\..\src\mesa\shader\slang\slang_utility.c\r
 # End Source File\r
 # Begin Source File\r
@@ -875,15 +855,15 @@ SOURCE=..\..\..\..\src\mesa\glapi\glthread.h
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\grammar.h\r
+SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\grammar_mesa.h\r
+SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar_mesa.h\r
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\..\..\src\mesa\shader\grammar_syn.h\r
+SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar_syn.h\r
 # End Source File\r
 # Begin Source File\r
 \r
@@ -1163,10 +1143,34 @@ SOURCE=..\..\..\..\src\mesa\main\simple_list.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_assignment.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_conditional.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_constructor.h\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\..\..\src\mesa\shader\slang\slang_assemble_typeinfo.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\..\..\src\mesa\shader\slang\slang_compile.h\r
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\..\..\src\mesa\shader\slang\slang_mesa.h\r
 # End Source File\r
 # Begin Source File\r
@@ -1175,6 +1179,10 @@ SOURCE=..\..\..\..\src\mesa\shader\slang\slang_preprocess.h
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\..\..\src\mesa\shader\slang\slang_storage.h\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\..\..\src\mesa\shader\slang\slang_utility.h\r
 # End Source File\r
 # Begin Source File\r