Bump to latest mesa in Debian

9 files changed, 1011 insertions, 2 deletions

diff --git a/windows/VC6/mesa/gdi/gdi.dsp b/windows/VC6/mesa/gdi/gdi.dsp
index 07130103878..ef382152162 100644
--- a/windows/VC6/mesa/gdi/gdi.dsp
+++ b/windows/VC6/mesa/gdi/gdi.dsp
@@ -123,7 +123,7 @@ LINK32=link.exe
 # 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

+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	copy Release_x86\OPENGL32.DLL "C:\Documents and Settings\mjk\Pulpit\pen\noise-demo"

 # End Special Build Tool

 

 !ELSEIF  "$(CFG)" == "gdi - Win32 Debug x86"

@@ -156,7 +156,7 @@ LINK32=link.exe
 # 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

+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	copy Debug_x86\OPENGL32.DLL "C:\Documents and Settings\mjk\Pulpit\pen\noise-demo"

 # End Special Build Tool

 

 !ENDIF 

diff --git a/windows/VC6/mesa/mesa/mesa.dsp b/windows/VC6/mesa/mesa/mesa.dsp
index 8d5034076f8..527598baaa6 100644
--- a/windows/VC6/mesa/mesa/mesa.dsp
+++ b/windows/VC6/mesa/mesa/mesa.dsp
@@ -433,6 +433,10 @@ SOURCE=..\..\..\..\src\mesa\main\rastpos.c
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\..\src\mesa\main\rbadaptors.c

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\..\src\mesa\main\renderbuffer.c

 # End Source File

 # Begin Source File

@@ -915,6 +919,10 @@ SOURCE=..\..\..\..\src\mesa\main\attrib.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\..\src\mesa\main\bitset.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\..\src\mesa\main\blend.h

 # End Source File

 # Begin Source File

@@ -1199,6 +1207,10 @@ SOURCE=..\..\..\..\src\mesa\main\rastpos.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\..\..\src\mesa\main\rbadaptors.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\..\..\src\mesa\main\renderbuffer.h

 # End Source File

 # Begin Source File

diff --git a/windows/VC6/progs/demos/gears.dsp b/windows/VC6/progs/demos/gears.dsp
new file mode 100644
index 00000000000..af6b3a8793d
--- /dev/null
+++ b/windows/VC6/progs/demos/gears.dsp
@@ -0,0 +1,114 @@
+# Microsoft Developer Studio Project File - Name="gears" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Console Application" 0x0103

+

+CFG=gears - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "gears.mak".

+!MESSAGE 

+!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 "gears.mak" CFG="gears - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "gears - Win32 Release" (based on "Win32 (x86) Console Application")

+!MESSAGE "gears - Win32 Debug" (based on "Win32 (x86) Console Application")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "gears - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c

+# ADD CPP /nologo /W3 /GX /O2 /I "../../../../../include" /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /FD /c

+# SUBTRACT CPP /YX

+# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /machine:I386

+# ADD LINK32 glut32.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 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 /subsystem:console /machine:I386 /libpath:"../glut/Release"

+# Begin Special Build Tool

+SOURCE="$(InputPath)"

+PostBuild_Cmds=copy Release\gears.exe ..\..\..\..\progs\demos

+# End Special Build Tool

+

+!ELSEIF  "$(CFG)" == "gears - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c

+# ADD CPP /nologo /W3 /Gm /GX /Zi /Od /I "../../../../../include" /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FD /GZ /c

+# SUBTRACT CPP /YX

+# 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 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.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 /subsystem:console /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 glut32.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 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 /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"../glut/Debug"

+# Begin Special Build Tool

+SOURCE="$(InputPath)"

+PostBuild_Cmds=copy Debug\gears.exe ..\..\..\..\progs\demos

+# End Special Build Tool

+

+!ENDIF 

+

+# Begin Target

+

+# Name "gears - Win32 Release"

+# Name "gears - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=..\..\..\..\progs\demos\gears.c

+# ADD CPP /I "../../../../include"

+# SUBTRACT CPP /I "../../../../../include"

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/windows/VC6/progs/glut/glut.dsp b/windows/VC6/progs/glut/glut.dsp
new file mode 100644
index 00000000000..04fb886c056
--- /dev/null
+++ b/windows/VC6/progs/glut/glut.dsp
@@ -0,0 +1,333 @@
+# Microsoft Developer Studio Project File - Name="glut" - Package Owner=<4>

+# Microsoft Developer Studio Generated Build File, Format Version 6.00

+# ** DO NOT EDIT **

+

+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102

+

+CFG=glut - Win32 Debug

+!MESSAGE This is not a valid makefile. To build this project using NMAKE,

+!MESSAGE use the Export Makefile command and run

+!MESSAGE 

+!MESSAGE NMAKE /f "glut.mak".

+!MESSAGE 

+!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 "glut.mak" CFG="glut - Win32 Debug"

+!MESSAGE 

+!MESSAGE Possible choices for configuration are:

+!MESSAGE 

+!MESSAGE "glut - Win32 Release" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE "glut - Win32 Debug" (based on "Win32 (x86) Dynamic-Link Library")

+!MESSAGE 

+

+# Begin Project

+# PROP AllowPerConfigDependencies 0

+# PROP Scc_ProjName ""

+# PROP Scc_LocalPath ""

+CPP=cl.exe

+MTL=midl.exe

+RSC=rc.exe

+

+!IF  "$(CFG)" == "glut - Win32 Release"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 0

+# PROP BASE Output_Dir "Release"

+# PROP BASE Intermediate_Dir "Release"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 0

+# PROP Output_Dir "Release"

+# PROP Intermediate_Dir "Release"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLUT_EXPORTS" /YX /FD /c

+# ADD CPP /nologo /MT /W3 /GX /O2 /I "../../../../include" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_DLL" /D "_USRDLL" /D "GLUT_EXPORTS" /D "MESA" /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 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

+# ADD LINK32 opengl32.lib glu32.lib winmm.lib msvcrt.lib oldnames.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/GLUT32.DLL" /libpath:"../../mesa/Release"

+# Begin Special Build Tool

+SOURCE="$(InputPath)"

+PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Release\GLUT32.LIB ..\..\..\..\lib	copy Release\GLUT32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Release\GLUT32.DLL ..\..\..\..\progs\demos

+# End Special Build Tool

+

+!ELSEIF  "$(CFG)" == "glut - Win32 Debug"

+

+# PROP BASE Use_MFC 0

+# PROP BASE Use_Debug_Libraries 1

+# PROP BASE Output_Dir "Debug"

+# PROP BASE Intermediate_Dir "Debug"

+# PROP BASE Target_Dir ""

+# PROP Use_MFC 0

+# PROP Use_Debug_Libraries 1

+# PROP Output_Dir "Debug"

+# PROP Intermediate_Dir "Debug"

+# PROP Ignore_Export_Lib 0

+# PROP Target_Dir ""

+# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "GLUT_EXPORTS" /YX /FD /GZ /c

+# ADD CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /I "../../../../include" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "_DLL" /D "_USRDLL" /D "GLUT_EXPORTS" /D "MESA" /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 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 /debug /machine:I386 /pdbtype:sept

+# ADD LINK32 winmm.lib msvcrtd.lib oldnames.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 glu32.lib /nologo /dll /incremental:no /debug /machine:I386 /nodefaultlib /out:"Debug/GLUT32.DLL" /pdbtype:sept /libpath:"../../mesa/Debug"

+# Begin Special Build Tool

+SOURCE="$(InputPath)"

+PostBuild_Cmds=if not exist ..\..\..\..\lib md ..\..\..\..\lib	copy Debug\GLUT32.LIB ..\..\..\..\lib	copy Debug\GLUT32.DLL ..\..\..\..\lib	if exist ..\..\..\..\progs\demos copy Debug\GLUT32.DLL ..\..\..\..\progs\demos

+# End Special Build Tool

+

+!ENDIF 

+

+# Begin Target

+

+# Name "glut - Win32 Release"

+# Name "glut - Win32 Debug"

+# Begin Group "Source Files"

+

+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_8x13.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_9x15.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_bitmap.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_bwidth.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_cindex.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_cmap.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_cursor.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_dials.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_dstr.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_event.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_ext.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_fbc.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_fullscrn.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_gamemode.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_get.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_hel10.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_hel12.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_hel18.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_init.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_input.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_joy.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_key.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_keyctrl.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_keyup.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_mesa.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_modifier.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_mroman.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_overlay.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_roman.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_shapes.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_space.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_stroke.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_swap.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_swidth.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_tablet.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_teapot.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_tr10.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_tr24.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_util.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_vidresize.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_warp.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_win.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glut_winmisc.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\win32_glx.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\win32_menu.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\win32_util.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\win32_winproc.c

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\win32_x11.c

+# End Source File

+# End Group

+# Begin Group "Header Files"

+

+# PROP Default_Filter "h;hpp;hxx;hm;inl"

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glutbitmap.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glutint.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glutstroke.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\glutwin32.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\stroke.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\win32_glx.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\..\..\src\glut\glx\win32_x11.h

+# End Source File

+# End Group

+# Begin Group "Resource Files"

+

+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"

+# End Group

+# End Target

+# End Project

diff --git a/windows/VC6/progs/progs.dsw b/windows/VC6/progs/progs.dsw
new file mode 100644
index 00000000000..d220455e643
--- /dev/null
+++ b/windows/VC6/progs/progs.dsw
@@ -0,0 +1,41 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00

+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!

+

+###############################################################################

+

+Project: "gears"=.\demos\gears.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Project: "glut"=.\glut\glut.dsp - Package Owner=<4>

+

+Package=<5>

+{{{

+}}}

+

+Package=<4>

+{{{

+}}}

+

+###############################################################################

+

+Global:

+

+Package=<5>

+{{{

+}}}

+

+Package=<3>

+{{{

+}}}

+

+###############################################################################

+

diff --git a/windows/VC7/mesa/mesa/mesa.vcproj b/windows/VC7/mesa/mesa/mesa.vcproj
index 6c7e71d92ca..d2db42444db 100644
--- a/windows/VC7/mesa/mesa/mesa.vcproj
+++ b/windows/VC7/mesa/mesa/mesa.vcproj
@@ -318,6 +318,9 @@
 				RelativePath="..\..\..\..\src\mesa\main\rastpos.c">

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\main\rbadaptors.c">

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.c">

 			</File>

 			<File

@@ -874,6 +877,9 @@
 				RelativePath="..\..\..\..\src\mesa\main\rastpos.h">

 			</File>

 			<File

+				RelativePath="..\..\..\..\src\mesa\main\rbadaptors.h">

+			</File>

+			<File

 				RelativePath="..\..\..\..\src\mesa\main\renderbuffer.h">

 			</File>

 			<File

diff --git a/windows/VC7/progs/demos/gears.vcproj b/windows/VC7/progs/demos/gears.vcproj
new file mode 100644
index 00000000000..9880b2e0806
--- /dev/null
+++ b/windows/VC7/progs/demos/gears.vcproj
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding = "Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.00"

+	Name="gears"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../../../include"

+				PreprocessorDefinitions="WIN32,_DEBUG,_CONSOLE"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="5"

+				PrecompiledHeaderFile=".\Debug/gears.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="3"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"

+				OutputFile=".\Debug/gears.exe"

+				LinkIncremental="2"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="../glut/Debug"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile=".\Debug/gears.pdb"

+				SubSystem="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\Debug/gears.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy Debug\gears.exe ..\..\..\..\progs\demos"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="1"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../../../../include"

+				PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"

+				StringPooling="TRUE"

+				RuntimeLibrary="4"

+				EnableFunctionLevelLinking="TRUE"

+				PrecompiledHeaderFile=".\Release/gears.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="glut32.lib odbc32.lib odbccp32.lib"

+				OutputFile=".\Release/gears.exe"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="../glut/Release"

+				ProgramDatabaseFile=".\Release/gears.pdb"

+				SubSystem="1"/>

+			<Tool

+				Name="VCMIDLTool"

+				TypeLibraryName=".\Release/gears.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="copy Release\gears.exe ..\..\..\..\progs\demos"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+	</Configurations>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\..\..\..\progs\demos\gears.c">

+				<FileConfiguration

+					Name="Debug|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""/>

+				</FileConfiguration>

+				<FileConfiguration

+					Name="Release|Win32">

+					<Tool

+						Name="VCCLCompilerTool"

+						AdditionalIncludeDirectories=""/>

+				</FileConfiguration>

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/windows/VC7/progs/glut/glut.vcproj b/windows/VC7/progs/glut/glut.vcproj
new file mode 100644
index 00000000000..2d0dd351ce5
--- /dev/null
+++ b/windows/VC7/progs/glut/glut.vcproj
@@ -0,0 +1,322 @@
+<?xml version="1.0" encoding = "Windows-1252"?>

+<VisualStudioProject

+	ProjectType="Visual C++"

+	Version="7.00"

+	Name="glut"

+	SccProjectName=""

+	SccLocalPath="">

+	<Platforms>

+		<Platform

+			Name="Win32"/>

+	</Platforms>

+	<Configurations>

+		<Configuration

+			Name="Debug|Win32"

+			OutputDirectory=".\Debug"

+			IntermediateDirectory=".\Debug"

+			ConfigurationType="2"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				Optimization="0"

+				AdditionalIncludeDirectories="../../../../include"

+				PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32"

+				BasicRuntimeChecks="3"

+				RuntimeLibrary="1"

+				PrecompiledHeaderFile=".\Debug/glut.pch"

+				AssemblerListingLocation=".\Debug/"

+				ObjectFile=".\Debug/"

+				ProgramDataBaseFileName=".\Debug/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				DebugInformationFormat="3"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="winmm.lib msvcrtd.lib oldnames.lib odbc32.lib odbccp32.lib opengl32.lib glu32.lib"

+				OutputFile="Debug/GLUT32.DLL"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="../../mesa/Debug"

+				IgnoreAllDefaultLibraries="TRUE"

+				GenerateDebugInformation="TRUE"

+				ProgramDatabaseFile=".\Debug/GLUT32.pdb"

+				ImportLibrary=".\Debug/GLUT32.lib"/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="_DEBUG"

+				MkTypLibCompatible="TRUE"

+				SuppressStartupBanner="TRUE"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Debug/glut.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib

+copy Debug\GLUT32.LIB ..\..\..\..\lib

+copy Debug\GLUT32.DLL ..\..\..\..\lib

+if exist ..\..\..\..\progs\demos copy Debug\GLUT32.DLL ..\..\..\..\progs\demos

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="_DEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+		<Configuration

+			Name="Release|Win32"

+			OutputDirectory=".\Release"

+			IntermediateDirectory=".\Release"

+			ConfigurationType="2"

+			UseOfMFC="0"

+			ATLMinimizesCRunTimeLibraryUsage="FALSE"

+			CharacterSet="2">

+			<Tool

+				Name="VCCLCompilerTool"

+				InlineFunctionExpansion="1"

+				AdditionalIncludeDirectories="../../../../include"

+				PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_DLL;_USRDLL;GLUT_EXPORTS;MESA;BUILD_GL32"

+				StringPooling="TRUE"

+				RuntimeLibrary="0"

+				EnableFunctionLevelLinking="TRUE"

+				PrecompiledHeaderFile=".\Release/glut.pch"

+				AssemblerListingLocation=".\Release/"

+				ObjectFile=".\Release/"

+				ProgramDataBaseFileName=".\Release/"

+				WarningLevel="3"

+				SuppressStartupBanner="TRUE"

+				CompileAs="0"/>

+			<Tool

+				Name="VCCustomBuildTool"/>

+			<Tool

+				Name="VCLinkerTool"

+				AdditionalOptions="/MACHINE:I386"

+				AdditionalDependencies="opengl32.lib glu32.lib winmm.lib msvcrt.lib oldnames.lib odbc32.lib odbccp32.lib"

+				OutputFile="Release/GLUT32.DLL"

+				LinkIncremental="1"

+				SuppressStartupBanner="TRUE"

+				AdditionalLibraryDirectories="../../mesa/Release"

+				IgnoreAllDefaultLibraries="TRUE"

+				ProgramDatabaseFile=".\Release/GLUT32.pdb"

+				ImportLibrary=".\Release/GLUT32.lib"/>

+			<Tool

+				Name="VCMIDLTool"

+				PreprocessorDefinitions="NDEBUG"

+				MkTypLibCompatible="TRUE"

+				SuppressStartupBanner="TRUE"

+				TargetEnvironment="1"

+				TypeLibraryName=".\Release/glut.tlb"/>

+			<Tool

+				Name="VCPostBuildEventTool"

+				CommandLine="if not exist ..\..\..\..\lib md ..\..\..\..\lib

+copy Release\GLUT32.LIB ..\..\..\..\lib

+copy Release\GLUT32.DLL ..\..\..\..\lib

+if exist ..\..\..\..\progs\demos copy Release\GLUT32.DLL ..\..\..\..\progs\demos

+"/>

+			<Tool

+				Name="VCPreBuildEventTool"/>

+			<Tool

+				Name="VCPreLinkEventTool"/>

+			<Tool

+				Name="VCResourceCompilerTool"

+				PreprocessorDefinitions="NDEBUG"

+				Culture="1033"/>

+			<Tool

+				Name="VCWebServiceProxyGeneratorTool"/>

+			<Tool

+				Name="VCWebDeploymentTool"/>

+		</Configuration>

+	</Configurations>

+	<Files>

+		<Filter

+			Name="Source Files"

+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_8x13.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_9x15.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_bitmap.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_bwidth.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_cindex.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_cmap.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_cursor.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_dials.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_dstr.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_event.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_ext.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_fbc.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_fullscrn.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_gamemode.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_get.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_hel10.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_hel12.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_hel18.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_init.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_input.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_joy.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_key.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_keyctrl.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_keyup.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_mesa.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_modifier.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_mroman.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_overlay.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_roman.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_shapes.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_space.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_stroke.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_swap.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_swidth.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_tablet.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_teapot.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_tr10.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_tr24.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_util.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_vidresize.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_warp.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_win.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glut_winmisc.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\win32_glx.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\win32_menu.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\win32_util.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\win32_winproc.c">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\win32_x11.c">

+			</File>

+		</Filter>

+		<Filter

+			Name="Header Files"

+			Filter="h;hpp;hxx;hm;inl">

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glutbitmap.h">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glutint.h">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glutstroke.h">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\glutwin32.h">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\stroke.h">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\win32_glx.h">

+			</File>

+			<File

+				RelativePath="..\..\..\..\src\glut\glx\win32_x11.h">

+			</File>

+		</Filter>

+		<Filter

+			Name="Resource Files"

+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">

+		</Filter>

+	</Files>

+	<Globals>

+	</Globals>

+</VisualStudioProject>

diff --git a/windows/VC7/progs/progs.sln b/windows/VC7/progs/progs.sln
new file mode 100644
index 00000000000..d94293e316f
--- /dev/null
+++ b/windows/VC7/progs/progs.sln
@@ -0,0 +1,27 @@
+Microsoft Visual Studio Solution File, Format Version 7.00

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gears", "demos\gears.vcproj", "{3A7B0671-10F8-45D1-B012-F6D650F817CE}"

+EndProject

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glut", "glut\glut.vcproj", "{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}"

+EndProject

+Global

+	GlobalSection(SolutionConfiguration) = preSolution

+		ConfigName.0 = Debug

+		ConfigName.1 = Release

+	EndGlobalSection

+	GlobalSection(ProjectDependencies) = postSolution

+	EndGlobalSection

+	GlobalSection(ProjectConfiguration) = postSolution

+		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug.ActiveCfg = Debug|Win32

+		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Debug.Build.0 = Debug|Win32

+		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release.ActiveCfg = Release|Win32

+		{3A7B0671-10F8-45D1-B012-F6D650F817CE}.Release.Build.0 = Release|Win32

+		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug.ActiveCfg = Debug|Win32

+		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Debug.Build.0 = Debug|Win32

+		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release.ActiveCfg = Release|Win32

+		{0234F0D2-C8A6-4C4D-93E7-0E2248049C67}.Release.Build.0 = Release|Win32

+	EndGlobalSection

+	GlobalSection(ExtensibilityGlobals) = postSolution

+	EndGlobalSection

+	GlobalSection(ExtensibilityAddIns) = postSolution

+	EndGlobalSection

+EndGlobal