From 1ab356afe820c918c7d399bd5e5fa32e993dd394 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Fri, 19 Aug 2011 23:35:14 +0000
Subject: [PATCH] Updated VS 2010 project file, and fixed minor compiler
 warnings.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2271 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 src/common/FrameBufferGL.cxx     | 16 ++++++++--------
 src/win32/Stella.vcxproj         |  1 -
 src/win32/Stella.vcxproj.filters |  3 ---
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/common/FrameBufferGL.cxx b/src/common/FrameBufferGL.cxx
index 9a697ae4c..0e72dd4a2 100644
--- a/src/common/FrameBufferGL.cxx
+++ b/src/common/FrameBufferGL.cxx
@@ -839,17 +839,17 @@ void FBSurfaceGL::updateCoords()
 {
   // Vertex coordinates
   // Upper left (x,y)
-  myCoord[0] = myXOrig;
-  myCoord[1] = myYOrig;
+  myCoord[0] = (GLfloat)myXOrig;
+  myCoord[1] = (GLfloat)myYOrig;
   // Upper right (x+w,y)
-  myCoord[2] = myXOrig + myWidth;
-  myCoord[3] = myYOrig;
+  myCoord[2] = (GLfloat)(myXOrig + myWidth);
+  myCoord[3] = (GLfloat)myYOrig;
   // Lower left (x,y+h)
-  myCoord[4] = myXOrig;
-  myCoord[5] = myYOrig + myHeight;
+  myCoord[4] = (GLfloat)myXOrig;
+  myCoord[5] = (GLfloat)(myYOrig + myHeight);
   // Lower right (x+w,y+h)
-  myCoord[6] = myXOrig + myWidth;
-  myCoord[7] = myYOrig + myHeight;
+  myCoord[6] = (GLfloat)(myXOrig + myWidth);
+  myCoord[7] = (GLfloat)(myYOrig + myHeight);
 
   // Texture coordinates
   // Upper left (x,y)
diff --git a/src/win32/Stella.vcxproj b/src/win32/Stella.vcxproj
index d7a4166cc..6188e0a83 100644
--- a/src/win32/Stella.vcxproj
+++ b/src/win32/Stella.vcxproj
@@ -395,7 +395,6 @@ SDLmain.lib
     <ClInclude Include="..\common\bspf.hxx" />
     <ClInclude Include="..\common\FrameBufferGL.hxx" />
     <ClInclude Include="..\common\FrameBufferSoft.hxx" />
-    <ClInclude Include="..\common\GLShaderProgs.hxx" />
     <ClInclude Include="..\common\StringList.hxx" />
     <ClInclude Include="..\common\StringParser.hxx" />
     <ClInclude Include="..\gui\LoggerDialog.hxx" />
diff --git a/src/win32/Stella.vcxproj.filters b/src/win32/Stella.vcxproj.filters
index 32da990ea..dda75ea11 100644
--- a/src/win32/Stella.vcxproj.filters
+++ b/src/win32/Stella.vcxproj.filters
@@ -599,9 +599,6 @@
     <ClInclude Include="..\common\FrameBufferSoft.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\common\GLShaderProgs.hxx">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="HomeFinder.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>