From 73f0e405e5bae5e6cfb4cb858360a007dc7af8ef Mon Sep 17 00:00:00 2001
From: tomcw <tomcw@users.noreply.github.com>
Date: Thu, 14 Aug 2014 22:27:41 +0100
Subject: [PATCH] Remove wchar.h & Update VS2012 proj with new headers

---
 AppleWinExpress2012.vcxproj         | 3 +++
 AppleWinExpress2012.vcxproj.filters | 9 +++++++++
 source/Mockingboard.cpp             | 1 -
 source/Speaker.cpp                  | 1 -
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/AppleWinExpress2012.vcxproj b/AppleWinExpress2012.vcxproj
index 31b90d45..0a825506 100644
--- a/AppleWinExpress2012.vcxproj
+++ b/AppleWinExpress2012.vcxproj
@@ -48,6 +48,7 @@
     <ClInclude Include="source\CPU\cpu65C02.h" />
     <ClInclude Include="source\CPU\cpu65d02.h" />
     <ClInclude Include="source\Debugger\Debug.h" />
+    <ClInclude Include="source\Debugger\DebugDefs.h" />
     <ClInclude Include="source\Debugger\Debugger_Assembler.h" />
     <ClInclude Include="source\Debugger\Debugger_Color.h" />
     <ClInclude Include="source\Debugger\Debugger_Console.h" />
@@ -58,7 +59,9 @@
     <ClInclude Include="source\Debugger\Debugger_Range.h" />
     <ClInclude Include="source\Debugger\Debugger_Symbols.h" />
     <ClInclude Include="source\Debugger\Debugger_Types.h" />
+    <ClInclude Include="source\Debugger\Util_Text.h" />
     <ClInclude Include="source\Disk.h" />
+    <ClInclude Include="source\DiskDefs.h" />
     <ClInclude Include="source\DiskImage.h" />
     <ClInclude Include="source\DiskImageHelper.h" />
     <ClInclude Include="source\Frame.h" />
diff --git a/AppleWinExpress2012.vcxproj.filters b/AppleWinExpress2012.vcxproj.filters
index 4c2d46cc..16d275cb 100644
--- a/AppleWinExpress2012.vcxproj.filters
+++ b/AppleWinExpress2012.vcxproj.filters
@@ -282,6 +282,15 @@
     <ClInclude Include="resource\winres.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
+    <ClInclude Include="source\DiskDefs.h">
+      <Filter>Source Files\Disk</Filter>
+    </ClInclude>
+    <ClInclude Include="source\Debugger\DebugDefs.h">
+      <Filter>Source Files\Debugger</Filter>
+    </ClInclude>
+    <ClInclude Include="source\Debugger\Util_Text.h">
+      <Filter>Source Files\Debugger</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Text Include="docs\CodingConventions.txt">
diff --git a/source/Mockingboard.cpp b/source/Mockingboard.cpp
index d43d1e25..590c7870 100644
--- a/source/Mockingboard.cpp
+++ b/source/Mockingboard.cpp
@@ -76,7 +76,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 //
 
 #include "StdAfx.h"
-#include <wchar.h>	// Only needed for <VS2008 ?
 
 #include "AppleWin.h"
 #include "CPU.h"
diff --git a/source/Speaker.cpp b/source/Speaker.cpp
index 529c3725..288c9c60 100644
--- a/source/Speaker.cpp
+++ b/source/Speaker.cpp
@@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
 #include "StdAfx.h"
-#include <wchar.h>	// Only needed for <VS2008 ?
 
 #include "AppleWin.h"
 #include "CPU.h"