diff --git a/build/vc10/glew.sln b/build/vc10/glew.sln
index 1b9ef70..b2060bc 100755
--- a/build/vc10/glew.sln
+++ b/build/vc10/glew.sln
@@ -1,18 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 11.00
 # Visual Studio 2010
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_shared", "glew_shared.vcxproj", "{A0131A4A-C065-87B7-8192-C9E5217A3DF2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_shared", "glew_shared.vcxproj", "{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_static", "glew_static.vcxproj", "{F2BDC6DC-B512-98D0-5AB3-91C400918947}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glew_static", "glew_static.vcxproj", "{664E6F0D-6784-4760-9565-D54F8EB1EDF4}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glewinfo", "glewinfo.vcxproj", "{3216FB79-AE60-6BAF-4DC8-D6991261660D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glewinfo", "glewinfo.vcxproj", "{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947} = {F2BDC6DC-B512-98D0-5AB3-91C400918947}
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4} = {664E6F0D-6784-4760-9565-D54F8EB1EDF4}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visualinfo", "visualinfo.vcxproj", "{82DDBC74-3C5A-B43E-E123-1BB59E11F425}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "visualinfo", "visualinfo.vcxproj", "{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}"
 	ProjectSection(ProjectDependencies) = postProject
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947} = {F2BDC6DC-B512-98D0-5AB3-91C400918947}
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4} = {664E6F0D-6784-4760-9565-D54F8EB1EDF4}
 	EndProjectSection
 EndProject
 Global
@@ -21,49 +21,40 @@ Global
 		Debug|Win32 = Debug|Win32
 		Release MX|Win32 = Release MX|Win32
 		Release|Win32 = Release|Win32
-		Template|Win32 = Template|Win32
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Debug MX|Win32.ActiveCfg = Debug MX|Win32
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Debug MX|Win32.Build.0 = Debug MX|Win32
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Debug|Win32.Build.0 = Debug|Win32
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Release MX|Win32.ActiveCfg = Release MX|Win32
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Release MX|Win32.Build.0 = Release MX|Win32
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Release|Win32.ActiveCfg = Release|Win32
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Release|Win32.Build.0 = Release|Win32
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Template|Win32.ActiveCfg = Release|Win32
-		{A0131A4A-C065-87B7-8192-C9E5217A3DF2}.Template|Win32.Build.0 = Release|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Debug MX|Win32.ActiveCfg = Debug MX|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Debug MX|Win32.Build.0 = Debug MX|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Debug|Win32.ActiveCfg = Debug|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Debug|Win32.Build.0 = Debug|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Release MX|Win32.ActiveCfg = Release MX|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Release MX|Win32.Build.0 = Release MX|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Release|Win32.ActiveCfg = Release|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Release|Win32.Build.0 = Release|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Template|Win32.ActiveCfg = Template|Win32
-		{F2BDC6DC-B512-98D0-5AB3-91C400918947}.Template|Win32.Build.0 = Template|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Debug MX|Win32.ActiveCfg = Debug MX|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Debug MX|Win32.Build.0 = Debug MX|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Debug|Win32.Build.0 = Debug|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Release MX|Win32.ActiveCfg = Release MX|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Release MX|Win32.Build.0 = Release MX|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Release|Win32.ActiveCfg = Release|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Release|Win32.Build.0 = Release|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Template|Win32.ActiveCfg = Template|Win32
-		{3216FB79-AE60-6BAF-4DC8-D6991261660D}.Template|Win32.Build.0 = Template|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Debug MX|Win32.ActiveCfg = Debug MX|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Debug MX|Win32.Build.0 = Debug MX|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Debug|Win32.ActiveCfg = Debug|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Debug|Win32.Build.0 = Debug|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Release MX|Win32.ActiveCfg = Release MX|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Release MX|Win32.Build.0 = Release MX|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Release|Win32.ActiveCfg = Release|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Release|Win32.Build.0 = Release|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Template|Win32.ActiveCfg = Template|Win32
-		{82DDBC74-3C5A-B43E-E123-1BB59E11F425}.Template|Win32.Build.0 = Template|Win32
+		{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.ActiveCfg = Debug MX|Win32
+		{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug MX|Win32.Build.0 = Debug MX|Win32
+		{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.ActiveCfg = Debug|Win32
+		{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Debug|Win32.Build.0 = Debug|Win32
+		{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.ActiveCfg = Release MX|Win32
+		{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release MX|Win32.Build.0 = Release MX|Win32
+		{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.ActiveCfg = Release|Win32
+		{55AE3D72-7DE6-F19F-AEF2-9AE8CA26CF3D}.Release|Win32.Build.0 = Release|Win32
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.ActiveCfg = Debug MX|Win32
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug MX|Win32.Build.0 = Debug MX|Win32
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.ActiveCfg = Debug|Win32
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Debug|Win32.Build.0 = Debug|Win32
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.ActiveCfg = Release MX|Win32
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release MX|Win32.Build.0 = Release MX|Win32
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.ActiveCfg = Release|Win32
+		{664E6F0D-6784-4760-9565-D54F8EB1EDF4}.Release|Win32.Build.0 = Release|Win32
+		{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.ActiveCfg = Debug MX|Win32
+		{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug MX|Win32.Build.0 = Debug MX|Win32
+		{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.ActiveCfg = Debug|Win32
+		{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Debug|Win32.Build.0 = Debug|Win32
+		{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.ActiveCfg = Release MX|Win32
+		{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release MX|Win32.Build.0 = Release MX|Win32
+		{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.ActiveCfg = Release|Win32
+		{8EFB5DCB-C0C4-1670-5938-A0E0F1A1C5EA}.Release|Win32.Build.0 = Release|Win32
+		{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.ActiveCfg = Debug MX|Win32
+		{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug MX|Win32.Build.0 = Debug MX|Win32
+		{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.ActiveCfg = Debug|Win32
+		{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Debug|Win32.Build.0 = Debug|Win32
+		{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.ActiveCfg = Release MX|Win32
+		{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release MX|Win32.Build.0 = Release MX|Win32
+		{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.ActiveCfg = Release|Win32
+		{79AA8443-86F4-649A-0BEB-0CB5E51B7D7E}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/build/vc10/glew_shared.vcxproj b/build/vc10/glew_shared.vcxproj
index 27d341c..d885962 100755
--- a/build/vc10/glew_shared.vcxproj
+++ b/build/vc10/glew_shared.vcxproj
@@ -60,24 +60,28 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'">
-    <OutDir>.\../../lib\</OutDir>
-    <IntDir>.\shared/release-mx\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>shared/release_mx/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>glew32mx</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\../../lib\</OutDir>
-    <IntDir>.\shared/release\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>shared/release/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>glew32</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'">
-    <OutDir>.\../../lib\</OutDir>
-    <IntDir>.\shared/debug-mx\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>shared/debug_mx/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>glew32mxd</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\../../lib\</OutDir>
-    <IntDir>.\shared/debug\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>shared/debug/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>glew32d</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'">
     <ClCompile>
diff --git a/build/vc10/glew_static.vcxproj b/build/vc10/glew_static.vcxproj
index d6fb0a9..02498a8 100755
--- a/build/vc10/glew_static.vcxproj
+++ b/build/vc10/glew_static.vcxproj
@@ -74,20 +74,27 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'">
-    <OutDir>.\../../lib\</OutDir>
-    <IntDir>.\static/debug-mx\</IntDir>
+    <OutDir>../../lib/</OutDir>
+    <IntDir>static/debug_mx/</IntDir>
+    <TargetName>glew32mxsd</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\../../lib\</OutDir>
-    <IntDir>.\static/release\</IntDir>
+    <OutDir>../../lib/</OutDir>
+    <IntDir>static/debug/</IntDir>
+    <TargetName>glew32s</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'">
-    <OutDir>.\../../lib\</OutDir>
-    <IntDir>.\static/release-mx\</IntDir>
+    <OutDir>../../lib/</OutDir>
+    <IntDir>static/release_mx/</IntDir>
+    <TargetName>glew32mxs</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\../../lib\</OutDir>
-    <IntDir>.\static/debug\</IntDir>
+    <OutDir>../../lib/</OutDir>
+    <IntDir>static/debug/</IntDir>
+    <TargetName>glew32sd</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+    <OutDir>../../lib/</OutDir>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'">
     <ClCompile>
@@ -116,6 +123,7 @@
     <Lib>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>../../lib/glew32mxsd.lib</OutputFile>
+      <TargetMachine>MachineX86</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -145,6 +153,7 @@
     <Lib>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>../../lib/glew32s.lib</OutputFile>
+      <TargetMachine>MachineX86</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'">
@@ -174,6 +183,7 @@
     <Lib>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>../../lib/glew32mxs.lib</OutputFile>
+      <TargetMachine>MachineX86</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -203,8 +213,14 @@
     <Lib>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <OutputFile>../../lib/glew32sd.lib</OutputFile>
+      <TargetMachine>MachineX86</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+    <ClCompile>
+      <AdditionalIncludeDirectories>../../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\glew.c" />
   </ItemGroup>
diff --git a/build/vc10/glewinfo.vcxproj b/build/vc10/glewinfo.vcxproj
index 0d835ec..f7d3195 100755
--- a/build/vc10/glewinfo.vcxproj
+++ b/build/vc10/glewinfo.vcxproj
@@ -70,24 +70,32 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'">
-    <OutDir>.\../../bin\</OutDir>
-    <IntDir>.\static/release-mx\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>static/release_mx/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>glewinfo-mx</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'">
-    <OutDir>.\../../bin\</OutDir>
-    <IntDir>.\static/debug-mx\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>static/debug_mx/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>glewinfo-mxd</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\../../bin\</OutDir>
-    <IntDir>.\static/debug\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>static/debug/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>glewinfod</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\../../bin\</OutDir>
-    <IntDir>.\static/release\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>static/release/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>glewinfo</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+    <OutDir>../../bin/</OutDir>
+    <TargetName>glewinfo</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'">
     <ClCompile>
diff --git a/build/vc10/visualinfo.vcxproj b/build/vc10/visualinfo.vcxproj
index a603381..9156678 100755
--- a/build/vc10/visualinfo.vcxproj
+++ b/build/vc10/visualinfo.vcxproj
@@ -70,24 +70,32 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'">
-    <OutDir>.\../../bin\</OutDir>
-    <IntDir>.\static/debug-mx\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>static/debug_mx/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>visualinfo-mxd</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>.\../../bin\</OutDir>
-    <IntDir>.\static/debug\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>static/debug/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>visualinfod</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release MX|Win32'">
-    <OutDir>.\../../bin\</OutDir>
-    <IntDir>.\static/release-mx\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>static/release_mx/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>visualinfo-mx</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>.\../../bin\</OutDir>
-    <IntDir>.\static/release\</IntDir>
+    <OutDir>../../bin/</OutDir>
+    <IntDir>static/release/</IntDir>
     <LinkIncremental>false</LinkIncremental>
+    <TargetName>visualinfo</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'">
+    <OutDir>../../bin/</OutDir>
+    <TargetName>visualinfo</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug MX|Win32'">
     <ClCompile>