From 9ac9605de156408580b81ba7e2780bd3f5372c6d Mon Sep 17 00:00:00 2001
From: Michal Krol <mjkrol@gmail.org>
Date: Mon, 27 Feb 2006 14:41:41 +0000
Subject: More GLSL code: - add x86 code generator; - add full support for
 uniforms in ARB_shader_objects; - add assembly instruction: global_addr; -
 reorganize #includes; - built-in uniforms accessed by index, rather than by
 name; - add some entries to x86sse rtasm; - add configurations to VC6
 projects: 'Release x86' and 'Debug x86'; - #define SLANG_X86 active only on
 VC6 x86 builds; - introduce code export table for a shader; - remove GNU
 license from the noise library;

---
 windows/VC6/mesa/gdi/gdi.dsp       |   74 +-
 windows/VC6/mesa/glu/glu.dsp       | 1942 ++++++++++++++++++++++++++++++++----
 windows/VC6/mesa/mesa.dsw          |   23 +-
 windows/VC6/mesa/mesa/mesa.dsp     |  119 ++-
 windows/VC6/mesa/osmesa/osmesa.dsp |   74 +-
 5 files changed, 2048 insertions(+), 184 deletions(-)

(limited to 'windows')

diff --git a/windows/VC6/mesa/gdi/gdi.dsp b/windows/VC6/mesa/gdi/gdi.dsp
index 03389a66dd..0713010387 100644
--- a/windows/VC6/mesa/gdi/gdi.dsp
+++ b/windows/VC6/mesa/gdi/gdi.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=gdi - Win32 Debug
+CFG=gdi - Win32 Debug x86
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,14 @@ CFG=gdi - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "gdi.mak" CFG="gdi - Win32 Debug"
+!MESSAGE NMAKE /f "gdi.mak" CFG="gdi - Win32 Debug x86"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "gdi - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "gdi - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gdi - Win32 Release x86" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "gdi - Win32 Debug x86" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -91,12 +93,80 @@ SOURCE="$(InputPath)"
 PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug\OPENGL32.LIB ..\..\..\..\lib	copy Debug\OPENGL32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug\OPENGL32.DLL ..\..\..\..\progs\demos
 # End Special Build Tool
 
+!ELSEIF  "$(CFG)" == "gdi - Win32 Release x86"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "gdi___Win32_Release_x86"
+# PROP BASE Intermediate_Dir "gdi___Win32_Release_x86"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_x86"
+# PROP Intermediate_Dir "Release_x86"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../main" /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../main" /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 mesa.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OPENGL32.DLL" /libpath:"../mesa/Release"
+# ADD LINK32 mesa.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release_x86/OPENGL32.DLL" /libpath:"../mesa/Release_x86"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release_x86\OPENGL32.LIB ..\..\..\..\lib	copy Release_x86\OPENGL32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release_x86\OPENGL32.DLL ..\..\..\..\progs\demos
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "gdi - Win32 Debug x86"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "gdi___Win32_Debug_x86"
+# PROP BASE Intermediate_Dir "gdi___Win32_Debug_x86"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_x86"
+# PROP Intermediate_Dir "Debug_x86"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FR /FD /GZ /c
+# SUBTRACT BASE CPP /YX /Yc /Yu
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GDI_EXPORTS" /D "_DLL" /D "BUILD_GL32" /D "MESA_MINWARN" /FR /FD /GZ /c
+# SUBTRACT CPP /YX /Yc /Yu
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 mesa.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OPENGL32.DLL" /pdbtype:sept /libpath:"../mesa/Debug"
+# ADD LINK32 mesa.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug_x86/OPENGL32.DLL" /pdbtype:sept /libpath:"../mesa/Debug_x86"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug_x86\OPENGL32.LIB ..\..\..\..\lib	copy Debug_x86\OPENGL32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug_x86\OPENGL32.DLL ..\..\..\..\progs\demos
+# End Special Build Tool
+
 !ENDIF 
 
 # Begin Target
 
 # Name "gdi - Win32 Release"
 # Name "gdi - Win32 Debug"
+# Name "gdi - Win32 Release x86"
+# Name "gdi - Win32 Debug x86"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
diff --git a/windows/VC6/mesa/glu/glu.dsp b/windows/VC6/mesa/glu/glu.dsp
index da035e9983..5f05a81dcc 100644
--- a/windows/VC6/mesa/glu/glu.dsp
+++ b/windows/VC6/mesa/glu/glu.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=glu - Win32 Debug
+CFG=glu - Win32 Debug x86
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,14 @@ CFG=glu - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "glu.mak" CFG="glu - Win32 Debug"
+!MESSAGE NMAKE /f "glu.mak" CFG="glu - Win32 Debug x86"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "glu - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "glu - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "glu - Win32 Release x86" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "glu - Win32 Debug x86" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -95,12 +97,84 @@ PreLink_Cmds=cl @compileDebug.txt	LIB /OUT:Debug/GLUCC.LIB @objectsDebug.txt
 PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug\GLU32.LIB ..\..\..\..\lib	copy Debug\GLU32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug\GLU32.DLL ..\..\..\..\progs\demos
 # End Special Build Tool
 
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "glu___Win32_Release_x86"
+# PROP BASE Intermediate_Dir "glu___Win32_Release_x86"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_x86"
+# PROP Intermediate_Dir "Release_x86"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 msvcrt.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Release/glucc.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/GLU32.DLL" /libpath:"../gdi/Release"
+# ADD LINK32 msvcrt.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Release/glucc.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release_x86/GLU32.DLL" /libpath:"../gdi/Release_x86"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PreLink_Desc=C++ Compilations
+PreLink_Cmds=cl @compileRelease.txt	LIB /OUT:Release/GLUCC.LIB @objectsRelease.txt
+PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release_x86\GLU32.LIB ..\..\..\..\lib	copy Release_x86\GLU32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release_x86\GLU32.DLL ..\..\..\..\progs\demos
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "glu___Win32_Debug_x86"
+# PROP BASE Intermediate_Dir "glu___Win32_Debug_x86"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_x86"
+# PROP Intermediate_Dir "Debug_x86"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/glu/sgi/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLU_EXPORTS" /D "BUILD_GL32" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 msvcrtd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Debug/glucc.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/GLU32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
+# ADD LINK32 msvcrtd.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib opengl32.lib Debug/glucc.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug_x86/GLU32.DLL" /pdbtype:sept /libpath:"../gdi/Debug_x86"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PreLink_Desc=C++ Compilations
+PreLink_Cmds=cl @compileDebug.txt	LIB /OUT:Debug/GLUCC.LIB @objectsDebug.txt
+PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug_x86\GLU32.LIB ..\..\..\..\lib	copy Debug_x86\GLU32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug_x86\GLU32.DLL ..\..\..\..\progs\demos
+# End Special Build Tool
+
 !ENDIF 
 
 # Begin Target
 
 # Name "glu - Win32 Release"
 # Name "glu - Win32 Debug"
+# Name "glu - Win32 Release x86"
+# Name "glu - Win32 Debug x86"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -143,7 +217,27 @@ SOURCE=..\..\..\..\src\glu\sgi\libtess\normal.c
 # Begin Source File
 
 SOURCE="..\..\..\..\src\glu\sgi\libtess\priorityq-heap.c"
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
@@ -592,378 +686,1878 @@ SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\zlassert.h
 # Begin Source File
 
 SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arc.cc
-# PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arcsorter.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\arctess.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\backend.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basiccrveval.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\basicsurfeval.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierEval.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatch.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\bezierPatchMesh.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc
-# PROP Exclude_From_Build 1
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bin.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\bufpool.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\cachingeval.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\ccw.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\coveandtiler.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curve.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvelist.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\curvesub.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\dataTransform.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\directedLine.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\displaylist.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flist.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\flistsorter.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glcurveval.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glinterface.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glrenderer.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\glsurfeval.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\gridWrap.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\hull.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\incurveeval.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\interface\insurfeval.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\intersect.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\knotvector.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdesc.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mapdescv.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\maplist.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mesher.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoChain.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoPolyPart.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libtess\README
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monotonizer.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\monoTriangulation.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\monoTriangulationBackend.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\mycode.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbsinterfac.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\nurbstess.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionX.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\partitionY.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patch.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\patchlist.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyDBG.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\polyUtil.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\primitiveStream.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\quicksort.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\quilt.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\reader.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libtess\README
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\rectBlock.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\renderhints.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleComp.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompBot.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompRight.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleCompTop.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampledLine.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\sampleMonoPoly.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\nurbtess\searchTree.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\slicer.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\sorter.cc
+SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\splitarcs.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\subdivider.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
-# End Source File
-# Begin Source File
 
-SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\tobezier.cc
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimline.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimregion.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\trimvertpool.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\uarray.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\..\..\src\glu\sgi\libnurbs\internals\varray.cc
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Source File
 
 SOURCE="..\..\..\..\src\glu\sgi\libtess\alg-outline"
+
+!IF  "$(CFG)" == "glu - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "glu - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
diff --git a/windows/VC6/mesa/mesa.dsw b/windows/VC6/mesa/mesa.dsw
index a6da850c1c..6160331e7e 100644
--- a/windows/VC6/mesa/mesa.dsw
+++ b/windows/VC6/mesa/mesa.dsw
@@ -3,7 +3,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00
 
 ###############################################################################
 
-Project: "gdi"=.\gdi\gdi.dsp - Package Owner=<4>
+Project: "gdi"=".\gdi\gdi.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -18,7 +18,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "glu"=.\glu\glu.dsp - Package Owner=<4>
+Project: "glu"=".\glu\glu.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -33,7 +33,7 @@ Package=<4>
 
 ###############################################################################
 
-Project: "mesa"=.\mesa\mesa.dsp - Package Owner=<4>
+Project: "mesa"=".\mesa\mesa.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
@@ -45,7 +45,22 @@ Package=<4>
 
 ###############################################################################
 
-Project: "osmesa"=.\osmesa\osmesa.dsp - Package Owner=<4>
+Project: "osmesa"=".\osmesa\osmesa.dsp" - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name gdi
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "test"=".\test\test.dsp" - Package Owner=<4>
 
 Package=<5>
 {{{
diff --git a/windows/VC6/mesa/mesa/mesa.dsp b/windows/VC6/mesa/mesa/mesa.dsp
index 4ed137ffd8..fcfe50ecec 100644
--- a/windows/VC6/mesa/mesa/mesa.dsp
+++ b/windows/VC6/mesa/mesa/mesa.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Static Library" 0x0104
 
-CFG=mesa - Win32 Debug
+CFG=mesa - Win32 Debug x86
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,14 @@ CFG=mesa - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "mesa.mak" CFG="mesa - Win32 Debug"
+!MESSAGE NMAKE /f "mesa.mak" CFG="mesa - Win32 Debug x86"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "mesa - Win32 Release" (based on "Win32 (x86) Static Library")
 !MESSAGE "mesa - Win32 Debug" (based on "Win32 (x86) Static Library")
+!MESSAGE "mesa - Win32 Release x86" (based on "Win32 (x86) Static Library")
+!MESSAGE "mesa - Win32 Debug x86" (based on "Win32 (x86) Static Library")
 !MESSAGE 
 
 # Begin Project
@@ -74,12 +76,60 @@ LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
 # ADD LIB32 /nologo
 
+!ELSEIF  "$(CFG)" == "mesa - Win32 Release x86"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "mesa___Win32_Release_x86"
+# PROP BASE Intermediate_Dir "mesa___Win32_Release_x86"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_x86"
+# PROP Intermediate_Dir "Release_x86"
+# PROP Target_Dir ""
+# ADD BASE 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
+# 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" /D "SLANG_X86" /YX /FD /Zm1000 /c
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Debug x86"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "mesa___Win32_Debug_x86"
+# PROP BASE Intermediate_Dir "mesa___Win32_Debug_x86"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_x86"
+# PROP Intermediate_Dir "Debug_x86"
+# PROP Target_Dir ""
+# ADD BASE 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
+# 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" /D "SLANG_X86" /Fr /FD /GZ /Zm1000 /c
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LIB32=link.exe -lib
+# ADD BASE LIB32 /nologo
+# ADD LIB32 /nologo
+
 !ENDIF 
 
 # Begin Target
 
 # Name "mesa - Win32 Release"
 # Name "mesa - Win32 Debug"
+# Name "mesa - Win32 Release x86"
+# Name "mesa - Win32 Debug x86"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
@@ -234,7 +284,27 @@ SOURCE=..\..\..\..\src\mesa\glapi\glthread.c
 # Begin Source File
 
 SOURCE=..\..\..\..\src\mesa\shader\grammar\grammar.c
+
+!IF  "$(CFG)" == "mesa - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
@@ -522,6 +592,10 @@ SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\..\src\mesa\shader\slang\slang_execute_x86.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\..\src\mesa\shader\slang\slang_export.c
 # End Source File
 # Begin Source File
@@ -711,11 +785,52 @@ SOURCE=..\..\..\..\src\mesa\main\varray.c
 # Begin Source File
 
 SOURCE=..\..\..\..\src\mesa\main\vsnprintf.c
+
+!IF  "$(CFG)" == "mesa - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Release x86"
+
+# PROP BASE Exclude_From_Build 1
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
 # PROP Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # Begin Source File
 
 SOURCE=..\..\..\..\src\mesa\main\vtxfmt.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\..\..\src\mesa\x86\rtasm\x86sse.c
+
+!IF  "$(CFG)" == "mesa - Win32 Release"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Debug"
+
+# PROP Exclude_From_Build 1
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Release x86"
+
+!ELSEIF  "$(CFG)" == "mesa - Win32 Debug x86"
+
+# PROP BASE Exclude_From_Build 1
+
+!ENDIF 
+
 # End Source File
 # End Group
 # Begin Group "Header Files"
diff --git a/windows/VC6/mesa/osmesa/osmesa.dsp b/windows/VC6/mesa/osmesa/osmesa.dsp
index 63c7b55039..0dd5cd4ac7 100644
--- a/windows/VC6/mesa/osmesa/osmesa.dsp
+++ b/windows/VC6/mesa/osmesa/osmesa.dsp
@@ -4,7 +4,7 @@
 
 # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
 
-CFG=osmesa - Win32 Debug
+CFG=osmesa - Win32 Debug x86
 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
 !MESSAGE use the Export Makefile command and run
 !MESSAGE 
@@ -13,12 +13,14 @@ CFG=osmesa - Win32 Debug
 !MESSAGE You can specify a configuration when running NMAKE
 !MESSAGE by defining the macro CFG on the command line. For example:
 !MESSAGE 
-!MESSAGE NMAKE /f "osmesa.mak" CFG="osmesa - Win32 Debug"
+!MESSAGE NMAKE /f "osmesa.mak" CFG="osmesa - Win32 Debug x86"
 !MESSAGE 
 !MESSAGE Possible choices for configuration are:
 !MESSAGE 
 !MESSAGE "osmesa - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE "osmesa - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "osmesa - Win32 Release x86" (based on "Win32 (x86) Dynamic-Link Library")
+!MESSAGE "osmesa - Win32 Debug x86" (based on "Win32 (x86) Dynamic-Link Library")
 !MESSAGE 
 
 # Begin Project
@@ -91,12 +93,80 @@ SOURCE="$(InputPath)"
 PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug\OSMESA32.LIB ..\..\..\..\lib	copy Debug\OSMESA32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug\OSMESA32.DLL ..\..\..\..\progs\demos
 # End Special Build Tool
 
+!ELSEIF  "$(CFG)" == "osmesa - Win32 Release x86"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "osmesa___Win32_Release_x86"
+# PROP BASE Intermediate_Dir "osmesa___Win32_Release_x86"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "Release_x86"
+# PROP Intermediate_Dir "Release_x86"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "NDEBUG"
+# ADD RSC /l 0x409 /d "NDEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 opengl32.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release/OSMESA32.DLL" /libpath:"../gdi/Release"
+# ADD LINK32 opengl32.lib winmm.lib msvcrt.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /machine:I386 /nodefaultlib /out:"Release_x86/OSMESA32.DLL" /libpath:"../gdi/Release_x86"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release_x86\OSMESA32.LIB ..\..\..\..\lib	copy Release_x86\OSMESA32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release_x86\OSMESA32.DLL ..\..\..\..\progs\demos
+# End Special Build Tool
+
+!ELSEIF  "$(CFG)" == "osmesa - Win32 Debug x86"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "osmesa___Win32_Debug_x86"
+# PROP BASE Intermediate_Dir "osmesa___Win32_Debug_x86"
+# PROP BASE Ignore_Export_Lib 0
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "Debug_x86"
+# PROP Intermediate_Dir "Debug_x86"
+# PROP Ignore_Export_Lib 0
+# PROP Target_Dir ""
+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /GZ /c
+# SUBTRACT BASE CPP /YX
+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /I "../../../../src/mesa" /I "../../../../src/mesa/main" /I "../../../../src/mesa/glapi" /I "../../../../src/mesa/swrast" /I "../../../../src/mesa/shader" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "OSMESA_EXPORTS" /FD /GZ /c
+# SUBTRACT CPP /YX
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
+# ADD BASE RSC /l 0x409 /d "_DEBUG"
+# ADD RSC /l 0x409 /d "_DEBUG"
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 opengl32.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OSMESA32.DLL" /pdbtype:sept /libpath:"../gdi/Debug"
+# ADD LINK32 opengl32.lib winmm.lib msvcrtd.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/OSMESA32.DLL" /pdbtype:sept /libpath:"../gdi/Debug_x86"
+# Begin Special Build Tool
+SOURCE="$(InputPath)"
+PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug_x86\OSMESA32.LIB ..\..\..\..\lib	copy Debug_x86\OSMESA32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug_x86\OSMESA32.DLL ..\..\..\..\progs\demos
+# End Special Build Tool
+
 !ENDIF 
 
 # Begin Target
 
 # Name "osmesa - Win32 Release"
 # Name "osmesa - Win32 Debug"
+# Name "osmesa - Win32 Release x86"
+# Name "osmesa - Win32 Debug x86"
 # Begin Group "Source Files"
 
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
-- 
cgit v1.2.3