From f3c9999072bb233f52c5bb2637af038b893d7854 Mon Sep 17 00:00:00 2001
From: stephena <stephena@8b62c5a3-ac7e-4cc8-8f21-d9a121418aba>
Date: Thu, 25 Apr 2013 14:03:11 +0000
Subject: [PATCH] Updated Visual Studio project file with new debugger-related
 classes.

Fixed some minor typos in the Windows build.

git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2710 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
---
 src/emucore/FrameBuffer.cxx      |   2 +-
 src/win32/SerialPortWin32.cxx    |   2 +-
 src/win32/Stella.vcxproj         |  63 ++++++++++-
 src/win32/Stella.vcxproj.filters | 189 ++++++++++++++++++++++++++++++-
 4 files changed, 246 insertions(+), 10 deletions(-)

diff --git a/src/emucore/FrameBuffer.cxx b/src/emucore/FrameBuffer.cxx
index e9e8a2975..1da78c5f1 100644
--- a/src/emucore/FrameBuffer.cxx
+++ b/src/emucore/FrameBuffer.cxx
@@ -591,7 +591,7 @@ uInt32 FrameBuffer::allocateSurface(int w, int h, bool useBase)
   FBSurface* surface = createSurface(w, h, useBase);
 
   // Add it to the list
-  mySurfaceList.insert(make_pair(mySurfaceList.size(), surface));
+  mySurfaceList.insert(make_pair((uInt32)mySurfaceList.size(), surface));
 
   // Return a reference to it
   return mySurfaceList.size() - 1;
diff --git a/src/win32/SerialPortWin32.cxx b/src/win32/SerialPortWin32.cxx
index 43f72b680..436a1c23c 100644
--- a/src/win32/SerialPortWin32.cxx
+++ b/src/win32/SerialPortWin32.cxx
@@ -50,7 +50,7 @@ bool SerialPortWin32::openPort(const string& device)
       dcb.DCBlength = sizeof(dcb);
       if(!BuildCommDCB("19200,n,8,1", &dcb))
       {
-        closePort()
+        closePort();
         return false;
       }
 
diff --git a/src/win32/Stella.vcxproj b/src/win32/Stella.vcxproj
index d64b3abf4..16334ee1d 100644
--- a/src/win32/Stella.vcxproj
+++ b/src/win32/Stella.vcxproj
@@ -233,6 +233,36 @@ SDLmain.lib
     <ClCompile Include="..\common\tv_filters\NTSCFilter.cxx" />
     <ClCompile Include="..\common\ZipHandler.cxx" />
     <ClCompile Include="..\debugger\gui\BoosterWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\Cart0840Widget.cxx" />
+    <ClCompile Include="..\debugger\gui\Cart2KWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\Cart3EWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\Cart3FWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\Cart4A50Widget.cxx" />
+    <ClCompile Include="..\debugger\gui\Cart4KWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartARWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartCMWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartCTYWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartCVWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartDPCPlusWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartDPCWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartE0Widget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartE7Widget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartEFSCWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartEFWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartF0Widget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartF4SCWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartF4Widget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartF6SCWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartF6Widget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartF8SCWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartF8Widget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartFA2Widget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartFAWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartFEWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartMCWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartSBWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartUAWidget.cxx" />
+    <ClCompile Include="..\debugger\gui\CartX07Widget.cxx" />
     <ClCompile Include="..\debugger\gui\DrivingWidget.cxx" />
     <ClCompile Include="..\debugger\gui\GenesisWidget.cxx" />
     <ClCompile Include="..\debugger\gui\JoystickWidget.cxx" />
@@ -438,6 +468,37 @@ SDLmain.lib
     <ClInclude Include="..\common\tv_filters\NTSCFilter.hxx" />
     <ClInclude Include="..\common\ZipHandler.hxx" />
     <ClInclude Include="..\debugger\gui\BoosterWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\Cart0840Widget.hxx" />
+    <ClInclude Include="..\debugger\gui\Cart2KWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\Cart3EWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\Cart3FWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\Cart4A50Widget.hxx" />
+    <ClInclude Include="..\debugger\gui\Cart4KWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartARWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartCMWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartCTYWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartCVWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartDebugWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartDPCPlusWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartDPCWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartE0Widget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartE7Widget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartEFSCWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartEFWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartF0Widget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartF4SCWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartF4Widget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartF6SCWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartF6Widget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartF8SCWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartF8Widget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartFA2Widget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartFAWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartFEWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartMCWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartSBWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartUAWidget.hxx" />
+    <ClInclude Include="..\debugger\gui\CartX07Widget.hxx" />
     <ClInclude Include="..\debugger\gui\ControllerWidget.hxx" />
     <ClInclude Include="..\debugger\gui\DrivingWidget.hxx" />
     <ClInclude Include="..\debugger\gui\GenesisWidget.hxx" />
@@ -548,7 +609,6 @@ SDLmain.lib
     <ClInclude Include="..\debugger\DebuggerParser.hxx" />
     <ClInclude Include="..\debugger\DebuggerSystem.hxx" />
     <ClInclude Include="..\debugger\DiStella.hxx" />
-    <ClInclude Include="..\debugger\Equate.hxx" />
     <ClInclude Include="..\debugger\Expression.hxx" />
     <ClInclude Include="..\debugger\PackedBitArray.hxx" />
     <ClInclude Include="..\debugger\gui\PromptWidget.hxx" />
@@ -560,7 +620,6 @@ SDLmain.lib
     <ClInclude Include="..\debugger\TIADebug.hxx" />
     <ClInclude Include="..\debugger\gui\TiaInfoWidget.hxx" />
     <ClInclude Include="..\debugger\gui\TiaOutputWidget.hxx" />
-    <ClInclude Include="..\debugger\TiaWidget.hxx" />
     <ClInclude Include="..\debugger\gui\TiaZoomWidget.hxx" />
     <ClInclude Include="..\debugger\gui\ToggleBitWidget.hxx" />
     <ClInclude Include="..\debugger\gui\TogglePixelWidget.hxx" />
diff --git a/src/win32/Stella.vcxproj.filters b/src/win32/Stella.vcxproj.filters
index 1c4793511..5d9d2b964 100644
--- a/src/win32/Stella.vcxproj.filters
+++ b/src/win32/Stella.vcxproj.filters
@@ -627,6 +627,96 @@
     <ClCompile Include="..\common\ZipHandler.cxx">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\debugger\gui\Cart2KWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\Cart3EWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\Cart3FWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\Cart4A50Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\Cart4KWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\Cart0840Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartARWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartCMWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartCTYWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartCVWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartDPCPlusWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartDPCWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartE0Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartE7Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartEFSCWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartEFWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartF0Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartF4SCWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartF4Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartF6SCWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartF6Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartF8SCWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartF8Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartFA2Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartFAWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartFEWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartMCWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartSBWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartUAWidget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
+    <ClCompile Include="..\debugger\gui\CartX07Widget.cxx">
+      <Filter>Source Files\debugger</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\common\Array.hxx">
@@ -914,9 +1004,6 @@
     <ClInclude Include="..\debugger\DiStella.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\Equate.hxx">
-      <Filter>Header Files\debugger</Filter>
-    </ClInclude>
     <ClInclude Include="..\debugger\Expression.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
@@ -950,9 +1037,6 @@
     <ClInclude Include="..\debugger\gui\TiaOutputWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
-    <ClInclude Include="..\debugger\TiaWidget.hxx">
-      <Filter>Header Files\debugger</Filter>
-    </ClInclude>
     <ClInclude Include="..\debugger\gui\TiaZoomWidget.hxx">
       <Filter>Header Files\debugger</Filter>
     </ClInclude>
@@ -1256,6 +1340,99 @@
     <ClInclude Include="..\common\ZipHandler.hxx">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="..\debugger\gui\Cart2KWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\Cart3EWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\Cart3FWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\Cart4A50Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\Cart4KWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\Cart0840Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartARWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartCMWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartCTYWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartCVWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartDebugWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartDPCPlusWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartDPCWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartE0Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartE7Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartEFSCWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartEFWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartF0Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartF4SCWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartF4Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartF6SCWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartF6Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartF8SCWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartF8Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartFA2Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartFAWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartFEWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartMCWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartSBWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartUAWidget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="..\debugger\gui\CartX07Widget.hxx">
+      <Filter>Header Files\debugger</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="stella.ico">