From 6a26a9548707b07535f0a33c37eef1a183561bfd Mon Sep 17 00:00:00 2001 From: tomcw Date: Wed, 13 Aug 2014 21:30:35 +0100 Subject: [PATCH] PCH refactor: remove non-system headers from stdafx.h --- source/Applewin.cpp | 21 ++++++++++-- source/Applewin.h | 2 ++ source/CPU.cpp | 15 ++++++-- source/Common.h | 2 -- source/Configuration/About.cpp | 26 ++++++++++++++ source/Configuration/Config.h | 1 + source/Configuration/PageAdvanced.cpp | 33 ++++++++++++++++-- source/Configuration/PageConfig.cpp | 32 ++++++++++++++++- source/Configuration/PageConfigTfe.cpp | 28 ++++++++++++++- source/Configuration/PageDisk.cpp | 34 +++++++++++++++++-- source/Configuration/PageInput.cpp | 30 +++++++++++++++- source/Configuration/PageSound.cpp | 31 ++++++++++++++++- source/Configuration/PropertySheet.cpp | 6 +++- source/Configuration/PropertySheetHelper.cpp | 11 ++++-- source/Configuration/PropertySheetHelper.h | 2 +- source/Debugger/Debug.cpp | 11 +++++- source/Debugger/Debug.h | 4 ++- source/Debugger/Debugger_Assembler.cpp | 6 ++++ source/Debugger/Debugger_Color.cpp | 3 ++ source/Debugger/Debugger_Commands.cpp | 4 +++ source/Debugger/Debugger_Console.cpp | 1 + source/Debugger/Debugger_DisassemblerData.cpp | 2 ++ source/Debugger/Debugger_Display.cpp | 11 +++++- source/Debugger/Debugger_Help.cpp | 4 +++ source/Debugger/Debugger_Parser.cpp | 4 +++ source/Debugger/Debugger_Range.cpp | 1 + source/Debugger/Debugger_Symbols.cpp | 3 ++ source/Disk.cpp | 18 +++++++--- source/Disk.h | 2 +- source/DiskImage.cpp | 3 +- source/DiskImageHelper.cpp | 11 +++++- source/DiskImageHelper.h | 2 ++ source/Frame.cpp | 22 ++++++++++-- source/Frame.h | 2 +- source/Harddisk.cpp | 10 ++++-- source/Joystick.cpp | 6 ++++ source/Keyboard.cpp | 4 +++ source/Memory.cpp | 19 +++++++++++ source/Mockingboard.cpp | 13 ++++--- source/MouseInterface.cpp | 13 ++++--- source/ParallelPrinter.cpp | 8 ++++- source/SaveState.cpp | 11 ++++++ source/SerialComms.cpp | 8 +++++ source/SerialComms.h | 4 +-- source/SoundCore.cpp | 4 +++ source/Speaker.cpp | 10 ++++++ source/StdAfx.h | 28 +-------------- source/Structs.h | 1 + source/Tape.cpp | 4 +++ source/Util_MemoryTextFile.cpp | 24 +++++++++++++ source/Video.cpp | 11 ++++++ source/Z80VICE/z80.cpp | 6 +++- source/z80emu.cpp | 3 ++ 53 files changed, 498 insertions(+), 77 deletions(-) diff --git a/source/Applewin.cpp b/source/Applewin.cpp index 9a8a74b3..ff266800 100644 --- a/source/Applewin.cpp +++ b/source/Applewin.cpp @@ -27,13 +27,30 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" -#include "DiskImage.h" -#include "Harddisk.h" +#include "AppleWin.h" +#include "CPU.h" +#include "Debug.h" +#include "Disk.h" +#include "DiskImage.h" +#include "Frame.h" +#include "Harddisk.h" +#include "Log.h" +#include "Memory.h" +#include "Mockingboard.h" #include "MouseInterface.h" +#include "ParallelPrinter.h" +#include "Registry.h" +#include "Riff.h" +#include "SaveState.h" +#include "SerialComms.h" +#include "SoundCore.h" +#include "Speaker.h" #ifdef USE_SPEECH_API #include "Speech.h" #endif +#include "Video.h" + #include "Configuration\About.h" #include "Configuration\PropertySheet.h" #include "Tfe\Tfe.h" diff --git a/source/Applewin.h b/source/Applewin.h index 2621d3ba..6fa6f896 100644 --- a/source/Applewin.h +++ b/source/Applewin.h @@ -1,5 +1,7 @@ #pragma once +#include "Structs.h" + void SetCurrentCLK6502(); void SetCurrentImageDir(const char* pszImageDir); diff --git a/source/CPU.cpp b/source/CPU.cpp index 02148503..f54cdb45 100644 --- a/source/CPU.cpp +++ b/source/CPU.cpp @@ -85,15 +85,24 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" + +#include "AppleWin.h" +#include "CPU.h" +#include "Frame.h" +#include "Memory.h" +#include "Mockingboard.h" #include "MouseInterface.h" +#ifdef USE_SPEECH_API +#include "Speech.h" +#endif +#include "Video.h" #include "z80emu.h" #include "Z80VICE\z80.h" #include "Z80VICE\z80mem.h" -#ifdef USE_SPEECH_API -#include "Speech.h" -#endif +#include "Debugger\Debug.h" + #define AF_SIGN 0x80 #define AF_OVERFLOW 0x40 diff --git a/source/Common.h b/source/Common.h index 19716f2b..05d339db 100644 --- a/source/Common.h +++ b/source/Common.h @@ -1,7 +1,5 @@ #pragma once -#define USE_SPEECH_API - const double _M14 = (157500000.0 / 11.0); // 14.3181818... * 10^6 const double CLK_6502 = ((_M14 * 65.0) / 912.0); // 65 cycles per 912 14M clocks //const double CLK_6502 = 23 * 44100; // 1014300 diff --git a/source/Configuration/About.cpp b/source/Configuration/About.cpp index eab60317..1d862b70 100644 --- a/source/Configuration/About.cpp +++ b/source/Configuration/About.cpp @@ -1,4 +1,30 @@ +/* +AppleWin : An Apple //e emulator for Windows + +Copyright (C) 1994-1996, Michael O'Brien +Copyright (C) 1999-2001, Oliver Schmidt +Copyright (C) 2002-2005, Tom Charlesworth +Copyright (C) 2006-2014, Tom Charlesworth, Michael Pohoreski, Nick Westgate + +AppleWin is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +AppleWin is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with AppleWin; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "stdafx.h" + +#include "..\AppleWin.h" +#include "..\Frame.h" #include "..\resource\resource.h" static const char g_szGPL[] = diff --git a/source/Configuration/Config.h b/source/Configuration/Config.h index 1cd4e3ed..626ba0a7 100644 --- a/source/Configuration/Config.h +++ b/source/Configuration/Config.h @@ -1,5 +1,6 @@ #pragma once +#include "..\AppleWin.h" #include "..\HardDisk.h" class CConfigNeedingRestart diff --git a/source/Configuration/PageAdvanced.cpp b/source/Configuration/PageAdvanced.cpp index ffd05ca2..27036958 100644 --- a/source/Configuration/PageAdvanced.cpp +++ b/source/Configuration/PageAdvanced.cpp @@ -1,7 +1,36 @@ +/* +AppleWin : An Apple //e emulator for Windows + +Copyright (C) 1994-1996, Michael O'Brien +Copyright (C) 1999-2001, Oliver Schmidt +Copyright (C) 2002-2005, Tom Charlesworth +Copyright (C) 2006-2014, Tom Charlesworth, Michael Pohoreski, Nick Westgate + +AppleWin is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +AppleWin is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with AppleWin; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "StdAfx.h" +#include "..\Structs.h" + +#include "..\Disk.h" +#include "..\ParallelPrinter.h" +#include "..\Registry.h" +#include "..\SaveState.h" +#include "..\resource\resource.h" #include "PageAdvanced.h" #include "PropertySheetHelper.h" -#include "..\resource\resource.h" CPageAdvanced* CPageAdvanced::ms_this = 0; // reinit'd in ctor @@ -61,7 +90,7 @@ BOOL CPageAdvanced::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPAR break; case IDC_PRINTER_DUMP_FILENAME_BROWSE: { - string strPrinterDumpLoc = m_PropertySheetHelper.BrowseToFile(hWnd, TEXT("Select printer dump file"), REGVALUE_PRINTER_FILENAME, TEXT("Text files (*.txt)\0*.txt\0") TEXT("All Files\0*.*\0")); + std::string strPrinterDumpLoc = m_PropertySheetHelper.BrowseToFile(hWnd, TEXT("Select printer dump file"), REGVALUE_PRINTER_FILENAME, TEXT("Text files (*.txt)\0*.txt\0") TEXT("All Files\0*.*\0")); SendDlgItemMessage(hWnd, IDC_PRINTER_DUMP_FILENAME, WM_SETTEXT, 0, (LPARAM)strPrinterDumpLoc.c_str()); } break; diff --git a/source/Configuration/PageConfig.cpp b/source/Configuration/PageConfig.cpp index c2d58f2c..0421b3c1 100644 --- a/source/Configuration/PageConfig.cpp +++ b/source/Configuration/PageConfig.cpp @@ -1,7 +1,37 @@ +/* +AppleWin : An Apple //e emulator for Windows + +Copyright (C) 1994-1996, Michael O'Brien +Copyright (C) 1999-2001, Oliver Schmidt +Copyright (C) 2002-2005, Tom Charlesworth +Copyright (C) 2006-2014, Tom Charlesworth, Michael Pohoreski, Nick Westgate + +AppleWin is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +AppleWin is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with AppleWin; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "StdAfx.h" + +#include "..\AppleWin.h" +#include "..\Disk.h" +#include "..\Frame.h" +#include "..\Registry.h" +#include "..\SerialComms.h" +#include "..\Video.h" +#include "..\resource\resource.h" #include "PageConfig.h" #include "PropertySheetHelper.h" -#include "..\resource\resource.h" CPageConfig* CPageConfig::ms_this = 0; // reinit'd in ctor diff --git a/source/Configuration/PageConfigTfe.cpp b/source/Configuration/PageConfigTfe.cpp index 37585c74..5c047897 100644 --- a/source/Configuration/PageConfigTfe.cpp +++ b/source/Configuration/PageConfigTfe.cpp @@ -1,8 +1,34 @@ +/* +AppleWin : An Apple //e emulator for Windows + +Copyright (C) 1994-1996, Michael O'Brien +Copyright (C) 1999-2001, Oliver Schmidt +Copyright (C) 2002-2005, Tom Charlesworth +Copyright (C) 2006-2014, Tom Charlesworth, Michael Pohoreski, Nick Westgate + +AppleWin is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +AppleWin is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with AppleWin; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "StdAfx.h" -#include "PageConfigTfe.h" + +#include "..\Common.h" +#include "..\Registry.h" #include "..\resource\resource.h" #include "..\Tfe\Tfe.h" #include "..\Tfe\Tfesupp.h" +#include "PageConfigTfe.h" CPageConfigTfe* CPageConfigTfe::ms_this = 0; // reinit'd in ctor diff --git a/source/Configuration/PageDisk.cpp b/source/Configuration/PageDisk.cpp index d9753130..2540ed13 100644 --- a/source/Configuration/PageDisk.cpp +++ b/source/Configuration/PageDisk.cpp @@ -1,8 +1,36 @@ +/* +AppleWin : An Apple //e emulator for Windows + +Copyright (C) 1994-1996, Michael O'Brien +Copyright (C) 1999-2001, Oliver Schmidt +Copyright (C) 2002-2005, Tom Charlesworth +Copyright (C) 2006-2014, Tom Charlesworth, Michael Pohoreski, Nick Westgate + +AppleWin is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +AppleWin is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with AppleWin; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "StdAfx.h" + +#include "..\AppleWin.h" +#include "..\Harddisk.h" +#include "..\Disk.h" +#include "..\Frame.h" +#include "..\Registry.h" +#include "..\resource\resource.h" #include "PageDisk.h" #include "PropertySheetHelper.h" -#include "..\Harddisk.h" -#include "..\resource\resource.h" CPageDisk* CPageDisk::ms_this = 0; // reinit'd in ctor @@ -86,7 +114,7 @@ BOOL CPageDisk::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPARAM l case IDC_CIDERPRESS_BROWSE: { - string CiderPressLoc = m_PropertySheetHelper.BrowseToFile(hWnd, TEXT("Select path to CiderPress"), REGVALUE_CIDERPRESSLOC, TEXT("Applications (*.exe)\0*.exe\0") TEXT("All Files\0*.*\0") ); + std::string CiderPressLoc = m_PropertySheetHelper.BrowseToFile(hWnd, TEXT("Select path to CiderPress"), REGVALUE_CIDERPRESSLOC, TEXT("Applications (*.exe)\0*.exe\0") TEXT("All Files\0*.*\0") ); RegSaveString(TEXT(REG_CONFIG), REGVALUE_CIDERPRESSLOC, 1, CiderPressLoc.c_str()); SendDlgItemMessage(hWnd, IDC_CIDERPRESS_FILENAME, WM_SETTEXT, 0, (LPARAM) CiderPressLoc.c_str()); } diff --git a/source/Configuration/PageInput.cpp b/source/Configuration/PageInput.cpp index 7184ed98..e9cd7f01 100644 --- a/source/Configuration/PageInput.cpp +++ b/source/Configuration/PageInput.cpp @@ -1,7 +1,35 @@ +/* +AppleWin : An Apple //e emulator for Windows + +Copyright (C) 1994-1996, Michael O'Brien +Copyright (C) 1999-2001, Oliver Schmidt +Copyright (C) 2002-2005, Tom Charlesworth +Copyright (C) 2006-2014, Tom Charlesworth, Michael Pohoreski, Nick Westgate + +AppleWin is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +AppleWin is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with AppleWin; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "StdAfx.h" +#include "..\Structs.h" + +#include "..\Disk.h" +#include "..\Keyboard.h" +#include "..\Registry.h" +#include "..\resource\resource.h" #include "PageInput.h" #include "PropertySheetHelper.h" -#include "..\resource\resource.h" CPageInput* CPageInput::ms_this = 0; // reinit'd in ctor diff --git a/source/Configuration/PageSound.cpp b/source/Configuration/PageSound.cpp index 8fc36101..f8f1117e 100644 --- a/source/Configuration/PageSound.cpp +++ b/source/Configuration/PageSound.cpp @@ -1,7 +1,36 @@ +/* +AppleWin : An Apple //e emulator for Windows + +Copyright (C) 1994-1996, Michael O'Brien +Copyright (C) 1999-2001, Oliver Schmidt +Copyright (C) 2002-2005, Tom Charlesworth +Copyright (C) 2006-2014, Tom Charlesworth, Michael Pohoreski, Nick Westgate + +AppleWin is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +AppleWin is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with AppleWin; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "StdAfx.h" +#include "..\Structs.h" + +#include "..\Disk.h" +#include "..\Mockingboard.h" +#include "..\Registry.h" +#include "..\Speaker.h" +#include "..\resource\resource.h" #include "PageSound.h" #include "PropertySheetHelper.h" -#include "..\resource\resource.h" CPageSound* CPageSound::ms_this = 0; // reinit'd in ctor diff --git a/source/Configuration/PropertySheet.cpp b/source/Configuration/PropertySheet.cpp index 8550bf3c..3c00c3f5 100644 --- a/source/Configuration/PropertySheet.cpp +++ b/source/Configuration/PropertySheet.cpp @@ -28,8 +28,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" -#include "PropertySheet.h" + +#include "..\AppleWin.h" +#include "..\Disk.h" +#include "..\Frame.h" #include "..\resource\resource.h" +#include "PropertySheet.h" void CPropertySheet::Init(void) { diff --git a/source/Configuration/PropertySheetHelper.cpp b/source/Configuration/PropertySheetHelper.cpp index 01c61c39..b135b059 100644 --- a/source/Configuration/PropertySheetHelper.cpp +++ b/source/Configuration/PropertySheetHelper.cpp @@ -22,9 +22,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "stdafx.h" -#include "PropertySheetHelper.h" + #include "..\AppleWin.h" // g_nAppMode, g_uScrollLockToggle, sg_PropertySheet +#include "..\Disk.h" +#include "..\Frame.h" +#include "..\Registry.h" +#include "..\SaveState.h" #include "IPropertySheet.h" +#include "PropertySheetHelper.h" /* Config causing AfterClose msgs: @@ -114,7 +119,7 @@ void CPropertySheetHelper::SetSlot5(SS_CARDTYPE NewCardType) // Used by: // . CPageDisk: IDC_CIDERPRESS_BROWSE // . CPageAdvanced: IDC_PRINTER_DUMP_FILENAME_BROWSE -string CPropertySheetHelper::BrowseToFile(HWND hWindow, TCHAR* pszTitle, TCHAR* REGVALUE, TCHAR* FILEMASKS) +std::string CPropertySheetHelper::BrowseToFile(HWND hWindow, TCHAR* pszTitle, TCHAR* REGVALUE, TCHAR* FILEMASKS) { static char PathToFile[MAX_PATH] = {0}; //This is a really awkward way to prevent mixing CiderPress and SaveStated values (RAPCS), but it seem the quickest. Here is its Line 1. strcpy(PathToFile, Snapshot_GetFilename()); //RAPCS, line 2. @@ -122,7 +127,7 @@ string CPropertySheetHelper::BrowseToFile(HWND hWindow, TCHAR* pszTitle, TCHAR* TCHAR szFilename[MAX_PATH]; strcpy(szFilename, ""); RegLoadString(TEXT("Configuration"), REGVALUE, 1, szFilename ,MAX_PATH); - string PathName = szFilename; + std::string PathName = szFilename; OPENFILENAME ofn; ZeroMemory(&ofn,sizeof(OPENFILENAME)); diff --git a/source/Configuration/PropertySheetHelper.h b/source/Configuration/PropertySheetHelper.h index d600dcb4..74896cdb 100644 --- a/source/Configuration/PropertySheetHelper.h +++ b/source/Configuration/PropertySheetHelper.h @@ -16,7 +16,7 @@ public: void FillComboBox(HWND window, int controlid, LPCTSTR choices, int currentchoice); void SetSlot4(SS_CARDTYPE NewCardType); void SetSlot5(SS_CARDTYPE NewCardType); - string BrowseToFile(HWND hWindow, TCHAR* pszTitle, TCHAR* REGVALUE,TCHAR* FILEMASKS); + std::string BrowseToFile(HWND hWindow, TCHAR* pszTitle, TCHAR* REGVALUE,TCHAR* FILEMASKS); void SaveStateUpdate(); void GetDiskBaseNameWithAWS(TCHAR* pszFilename); int SaveStateSelectImage(HWND hWindow, TCHAR* pszTitle, bool bSave); diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index 53dbe436..2af6a2ca 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -30,7 +30,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //#pragma warning(disable: 4786) #include "StdAfx.h" -#include "debugger_display.h" // dup from stdafx.h, but CPP analysis isn't picking up APPLE_FONT_NEW + +#include "Debug.h" + +#include "..\AppleWin.h" +#include "..\CPU.h" +#include "..\Disk.h" +#include "..\Frame.h" +#include "..\Keyboard.h" +#include "..\Memory.h" +#include "..\Video.h" // #define DEBUG_COMMAND_HELP 1 // #define DEBUG_ASM_HASH 1 diff --git a/source/Debugger/Debug.h b/source/Debugger/Debug.h index 78f07f0b..b1808783 100644 --- a/source/Debugger/Debug.h +++ b/source/Debugger/Debug.h @@ -5,6 +5,8 @@ #include using namespace std; +#include "..\Structs.h" + #include "Debugger_Types.h" #include "Debugger_DisassemblerData.h" #include "Debugger_Range.h" @@ -14,7 +16,7 @@ using namespace std; #include "Debugger_Help.h" #include "Debugger_Display.h" #include "Debugger_Symbols.h" -#include "Util_MemoryTextFile.h" +#include "..\Util_MemoryTextFile.h" // Globals __________________________________________________________________ diff --git a/source/Debugger/Debugger_Assembler.cpp b/source/Debugger/Debugger_Assembler.cpp index 1670d45a..4a42076e 100644 --- a/source/Debugger/Debugger_Assembler.cpp +++ b/source/Debugger/Debugger_Assembler.cpp @@ -28,6 +28,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "Debug.h" + +#include "..\CPU.h" +#include "..\Frame.h" +#include "..\Memory.h" + #define DEBUG_ASSEMBLER 0 // Globals __________________________________________________________________ diff --git a/source/Debugger/Debugger_Color.cpp b/source/Debugger/Debugger_Color.cpp index be1f6014..6a930c49 100644 --- a/source/Debugger/Debugger_Color.cpp +++ b/source/Debugger/Debugger_Color.cpp @@ -25,6 +25,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "Debug.h" + + // Color ______________________________________________________________________ int g_iColorScheme = SCHEME_COLOR; diff --git a/source/Debugger/Debugger_Commands.cpp b/source/Debugger/Debugger_Commands.cpp index fc5fd10f..151f6543 100644 --- a/source/Debugger/Debugger_Commands.cpp +++ b/source/Debugger/Debugger_Commands.cpp @@ -25,6 +25,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "Debug.h" + +#include "..\Frame.h" + // Commands _______________________________________________________________________________________ #define DEBUGGER__COMMANDS_VERIFY_TXT__ "\xDE\xAD\xC0\xDE" diff --git a/source/Debugger/Debugger_Console.cpp b/source/Debugger/Debugger_Console.cpp index e11e052b..91bc4b2f 100644 --- a/source/Debugger/Debugger_Console.cpp +++ b/source/Debugger/Debugger_Console.cpp @@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "Debug.h" // Console ________________________________________________________________________________________ diff --git a/source/Debugger/Debugger_DisassemblerData.cpp b/source/Debugger/Debugger_DisassemblerData.cpp index b60cd38f..74f3b5e4 100644 --- a/source/Debugger/Debugger_DisassemblerData.cpp +++ b/source/Debugger/Debugger_DisassemblerData.cpp @@ -25,6 +25,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "Debug.h" + // Disassembler Data ______________________________________________________________________________ diff --git a/source/Debugger/Debugger_Display.cpp b/source/Debugger/Debugger_Display.cpp index 745eeed3..db4420ab 100644 --- a/source/Debugger/Debugger_Display.cpp +++ b/source/Debugger/Debugger_Display.cpp @@ -27,7 +27,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" -#include "debugger_display.h" // dup from stdafx.h, but CPP analysis isn't picking up USE_APPLE_FONT + +#include "Debug.h" +#include "Debugger_Display.h" + +#include "..\AppleWin.h" +#include "..\CPU.h" +#include "..\Frame.h" +#include "..\Memory.h" +#include "..\Mockingboard.h" +#include "..\Video.h" // NEW UI debugging - force display ALL meta-info (regs, stack, bp, watches, zp) for debugging purposes #define DEBUG_FORCE_DISPLAY 0 diff --git a/source/Debugger/Debugger_Help.cpp b/source/Debugger/Debugger_Help.cpp index b9984ffd..f3c27ff8 100644 --- a/source/Debugger/Debugger_Help.cpp +++ b/source/Debugger/Debugger_Help.cpp @@ -28,6 +28,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "Debug.h" + +#include "..\AppleWin.h" + #define DEBUG_COLOR_CONSOLE 0 diff --git a/source/Debugger/Debugger_Parser.cpp b/source/Debugger/Debugger_Parser.cpp index 4a925a30..76dc8d85 100644 --- a/source/Debugger/Debugger_Parser.cpp +++ b/source/Debugger/Debugger_Parser.cpp @@ -28,6 +28,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "Debug.h" + +#include "..\CPU.h" +#include "..\Memory.h" // Args ___________________________________________________________________________________________ diff --git a/source/Debugger/Debugger_Range.cpp b/source/Debugger/Debugger_Range.cpp index e1dfe4d5..d60a7dc0 100644 --- a/source/Debugger/Debugger_Range.cpp +++ b/source/Debugger/Debugger_Range.cpp @@ -28,6 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "Debug.h" // Util - Range _______________________________________________________________ diff --git a/source/Debugger/Debugger_Symbols.cpp b/source/Debugger/Debugger_Symbols.cpp index 0d7d2c91..288d0064 100644 --- a/source/Debugger/Debugger_Symbols.cpp +++ b/source/Debugger/Debugger_Symbols.cpp @@ -28,6 +28,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "Debug.h" + +#include "..\AppleWin.h" // 2.6.2.13 Added: Can now enable/disable selected symbol table(s) ! // Allow the user to disable/enable symbol tables diff --git a/source/Disk.cpp b/source/Disk.cpp index 2f660305..6fcff6ff 100644 --- a/source/Disk.cpp +++ b/source/Disk.cpp @@ -27,7 +27,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" + +#include "AppleWin.h" +#include "Disk.h" #include "DiskImage.h" +#include "Frame.h" +#include "Memory.h" +#include "Registry.h" +#include "Video.h" + #include "..\resource\resource.h" #define LOG_DISK_ENABLED 0 @@ -60,8 +68,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA { TCHAR imagename[ MAX_DISK_IMAGE_NAME + 1 ]; // (ie. no extension) TCHAR fullname [ MAX_DISK_FULL_NAME + 1 ]; // or : This is persisted to the snapshot file - string strDiskPathFilename; - string strFilenameInZip; // 0x00 or + std::string strDiskPathFilename; + std::string strFilenameInZip; // 0x00 or HIMAGE imagehandle; // Init'd by DiskInsert() -> ImageOpen() int track; LPBYTE trackimage; @@ -119,12 +127,12 @@ int DiskGetCurrentPhase(void) { return g_aFloppyDisk[currdrive].phase; } int DiskGetCurrentOffset(void) { return g_aFloppyDisk[currdrive].byte; } int DiskGetTrack( int drive ) { return g_aFloppyDisk[ drive ].track; } -const string& DiskGetDiskPathFilename(const int iDrive) +const std::string& DiskGetDiskPathFilename(const int iDrive) { return g_aFloppyDisk[iDrive].strDiskPathFilename; } -static void DiskSetDiskPathFilename(const int iDrive, const string strPathName) +static void DiskSetDiskPathFilename(const int iDrive, const std::string strPathName) { g_aFloppyDisk[iDrive].strDiskPathFilename = strPathName; } @@ -977,7 +985,7 @@ bool DiskDriveSwap(void) // Swap disks between drives // . NB. We swap trackimage ptrs (so don't need to swap the buffers' data) // . TODO: Consider array of Pointers: Disk_t* g_aDrive[] - swap(g_aFloppyDisk[0], g_aFloppyDisk[1]); + std::swap(g_aFloppyDisk[0], g_aFloppyDisk[1]); Disk_SaveLastDiskImage(DRIVE_1); Disk_SaveLastDiskImage(DRIVE_2); diff --git a/source/Disk.h b/source/Disk.h index c38b346b..5c7daa02 100644 --- a/source/Disk.h +++ b/source/Disk.h @@ -40,7 +40,7 @@ const bool IMAGE_DONT_CREATE = false; const bool IMAGE_CREATE = true; extern BOOL enhancedisk; -const string& DiskGetDiskPathFilename(const int iDrive); +const std::string& DiskGetDiskPathFilename(const int iDrive); void DiskInitialize(void); // DiskIIManagerStartup() void DiskDestroy(void); // no, doesn't "destroy" the disk image. DiskIIManagerShutdown() diff --git a/source/DiskImage.cpp b/source/DiskImage.cpp index 465b5821..f38ae244 100644 --- a/source/DiskImage.cpp +++ b/source/DiskImage.cpp @@ -26,13 +26,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Author: Various */ - #include "StdAfx.h" +#include "Structs.h" #include "DiskImage.h" #include "DiskImageHelper.h" - static CDiskImageHelper sg_DiskImageHelper; //=========================================================================== diff --git a/source/DiskImageHelper.cpp b/source/DiskImageHelper.cpp index ff53ab1a..d1f6d8c7 100644 --- a/source/DiskImageHelper.cpp +++ b/source/DiskImageHelper.cpp @@ -28,8 +28,17 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "stdafx.h" -#include "DiskImageHelper.h" +#include "Structs.h" + +#include "zlib.h" +#include "unzip.h" +#include "iowin32.h" + +#include "CPU.h" +#include "Disk.h" #include "DiskImage.h" +#include "DiskImageHelper.h" +#include "Memory.h" /* DO logical order 0 1 2 3 4 5 6 7 8 9 A B C D E F */ diff --git a/source/DiskImageHelper.h b/source/DiskImageHelper.h index 711d83d6..e80015bc 100644 --- a/source/DiskImageHelper.h +++ b/source/DiskImageHelper.h @@ -1,5 +1,7 @@ #pragma once +#include "zip.h" + #define GZ_SUFFIX ".gz" #define GZ_SUFFIX_LEN (sizeof(GZ_SUFFIX)-1) diff --git a/source/Frame.cpp b/source/Frame.cpp index 1a3af671..150dcded 100644 --- a/source/Frame.cpp +++ b/source/Frame.cpp @@ -27,15 +27,33 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" +#include + +#include "AppleWin.h" +#include "CPU.h" +#include "Disk.h" #include "DiskImage.h" #include "Harddisk.h" +#include "Frame.h" +#include "Keyboard.h" +#include "Log.h" +#include "Memory.h" +#include "Mockingboard.h" #include "MouseInterface.h" -#include "..\resource\resource.h" -#include +#include "ParallelPrinter.h" +#include "Registry.h" +#include "SaveState.h" +#include "SerialComms.h" +#include "SoundCore.h" +#include "Speaker.h" #ifdef USE_SPEECH_API #include "Speech.h" #endif +#include "Video.h" + +#include "..\resource\resource.h" #include "Configuration\PropertySheet.h" +#include "Debugger\Debug.h" //#define ENABLE_MENU 0 diff --git a/source/Frame.h b/source/Frame.h index d524a6ab..322820b7 100644 --- a/source/Frame.h +++ b/source/Frame.h @@ -28,7 +28,7 @@ // Emulator extern bool g_bFreshReset; - extern string PathFilename[2]; + extern std::string PathFilename[2]; extern bool g_bScrollLock_FullSpeed; extern int g_nCharsetType; diff --git a/source/Harddisk.cpp b/source/Harddisk.cpp index fa43b753..0a9964ad 100644 --- a/source/Harddisk.cpp +++ b/source/Harddisk.cpp @@ -27,9 +27,15 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" -#include "HardDisk.h" + +#include "AppleWin.h" #include "DiskImage.h" // ImageError_e, Disk_Status_e #include "DiskImageHelper.h" +#include "Frame.h" +#include "HardDisk.h" +#include "Memory.h" +#include "Registry.h" + #include "..\resource\resource.h" /* @@ -229,7 +235,7 @@ static void NotifyInvalidImage(TCHAR* pszImageFilename) static BOOL HD_Load_Image(const int iDrive, LPCSTR pszImageFilename) { const bool bCreateIfNecessary = false; // NB. Don't allow creation of HDV files - string strFilenameInZip; // TODO: Use this + std::string strFilenameInZip; // TODO: Use this ImageError_e Error = ImageOpen(pszImageFilename, iDrive, bCreateIfNecessary, strFilenameInZip); g_HardDisk[iDrive].hd_imageloaded = (Error == eIMAGE_ERROR_NONE); diff --git a/source/Joystick.cpp b/source/Joystick.cpp index 1d4a2d1d..9bdf5491 100644 --- a/source/Joystick.cpp +++ b/source/Joystick.cpp @@ -38,7 +38,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // - This is because the 2-joystick version of Mario Bros expects the 2nd joystick to control Apple switch #2. #include "StdAfx.h" + +#include "AppleWin.h" +#include "CPU.h" +#include "Disk.h" +#include "Memory.h" #include "MouseInterface.h" + #include "Configuration\PropertySheet.h" #define BUTTONTIME 5000 // TODO: Describe this magic number diff --git a/source/Keyboard.cpp b/source/Keyboard.cpp index eaa24f6c..2b1e1727 100644 --- a/source/Keyboard.cpp +++ b/source/Keyboard.cpp @@ -28,6 +28,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "AppleWin.h" +#include "Frame.h" +#include "Keyboard.h" +#include "Tape.h" static bool g_bKeybBufferEnable = false; diff --git a/source/Memory.cpp b/source/Memory.cpp index 3231f292..e9deb7af 100644 --- a/source/Memory.cpp +++ b/source/Memory.cpp @@ -27,15 +27,34 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" + +#include "AppleWin.h" +#include "CPU.h" +#include "Disk.h" +#include "Frame.h" #include "Harddisk.h" +#include "Keyboard.h" +#include "Memory.h" +#include "Mockingboard.h" #include "MouseInterface.h" #include "NoSlotClock.h" +#include "ParallelPrinter.h" +#include "Registry.h" +#include "SerialComms.h" +#include "Speaker.h" +#include "Tape.h" +#include "Video.h" + #include "z80emu.h" #include "Z80VICE\z80.h" #include "Z80VICE\z80mem.h" #include "..\resource\resource.h" #include "Configuration\PropertySheet.h" +#include +using namespace std; +#include "Debugger\Debugger_Types.h" // Needs and namespace std + // Memory Flag #define MF_80STORE 0x00000001 #define MF_ALTZP 0x00000002 diff --git a/source/Mockingboard.cpp b/source/Mockingboard.cpp index 0626b8bf..22203bd3 100644 --- a/source/Mockingboard.cpp +++ b/source/Mockingboard.cpp @@ -76,15 +76,20 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // #include "StdAfx.h" - - -#define LOG_SSI263 0 - #include +#include "AppleWin.h" +#include "CPU.h" +#include "Log.h" +#include "Memory.h" +#include "Mockingboard.h" +#include "SoundCore.h" + #include "AY8910.h" #include "SSI263Phonemes.h" +#define LOG_SSI263 0 + #define SY6522_DEVICE_A 0 #define SY6522_DEVICE_B 1 diff --git a/source/MouseInterface.cpp b/source/MouseInterface.cpp index 36d81962..b4bc5664 100644 --- a/source/MouseInterface.cpp +++ b/source/MouseInterface.cpp @@ -41,16 +41,21 @@ Etc. #include "stdafx.h" +#include "Structs.h" +#include "CPU.h" +#include "Frame.h" // FrameSetCursorPosByMousePos() +#include "Log.h" +#include "Memory.h" +#include "MouseInterface.h" +#include "SoundCore.h" // SAFE_RELEASE() + +#include "..\resource\resource.h" #ifdef _DEBUG #define _DEBUG_SPURIOUS_IRQ #endif -#include "..\resource\resource.h" -#include "MouseInterface.h" -#include "Frame.h" // FrameSetCursorPosByMousePos() - // Sets mouse mode #define MOUSE_SET 0x00 // Reads mouse position diff --git a/source/ParallelPrinter.cpp b/source/ParallelPrinter.cpp index b8c6ef16..2ef531a6 100644 --- a/source/ParallelPrinter.cpp +++ b/source/ParallelPrinter.cpp @@ -27,6 +27,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" + +#include "AppleWin.h" +#include "Memory.h" +#include "ParallelPrinter.h" +#include "Registry.h" + #include "..\resource\resource.h" static DWORD inactivity = 0; @@ -100,7 +106,7 @@ static void ClosePrint() { fclose(file); file = NULL; - string ExtendedFileName = "copy \""; + std::string ExtendedFileName = "copy \""; ExtendedFileName.append (Printer_GetFilename()); ExtendedFileName.append ("\" prn"); //if (g_bDumpToPrinter) ShellExecute(NULL, "print", Printer_GetFilename(), NULL, NULL, 0); //Print through Notepad diff --git a/source/SaveState.cpp b/source/SaveState.cpp index a037ffdf..b5566ba5 100644 --- a/source/SaveState.cpp +++ b/source/SaveState.cpp @@ -27,7 +27,18 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" + +#include "AppleWin.h" +#include "CPU.h" +#include "Disk.h" +#include "Frame.h" #include "Joystick.h" +#include "Keyboard.h" +#include "Memory.h" +#include "Mockingboard.h" +#include "SerialComms.h" +#include "Speaker.h" +#include "Video.h" #define DEFAULT_SNAPSHOT_NAME "SaveState.aws" diff --git a/source/SerialComms.cpp b/source/SerialComms.cpp index 6373b25f..3342e80a 100644 --- a/source/SerialComms.cpp +++ b/source/SerialComms.cpp @@ -39,6 +39,14 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // #include "StdAfx.h" + +#include "AppleWin.h" +#include "CPU.h" +#include "Disk.h" +#include "Frame.h" +#include "Memory.h" +#include "SerialComms.h" + #include "..\resource\resource.h" //#define SUPPORT_MODEM diff --git a/source/SerialComms.h b/source/SerialComms.h index 5facb1af..d75d2ea9 100644 --- a/source/SerialComms.h +++ b/source/SerialComms.h @@ -112,9 +112,9 @@ private: // CRITICAL_SECTION m_CriticalSection; // To guard /g_vRecvBytes/ - deque m_qComSerialBuffer[2]; + std::deque m_qComSerialBuffer[2]; volatile UINT m_vuRxCurrBuffer; // Written to on COM recv. SSC reads from other one - deque m_qTcpSerialBuffer; + std::deque m_qTcpSerialBuffer; // diff --git a/source/SoundCore.cpp b/source/SoundCore.cpp index e28ed3fd..4733bc5e 100644 --- a/source/SoundCore.cpp +++ b/source/SoundCore.cpp @@ -28,6 +28,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "AppleWin.h" +#include "Frame.h" +#include "SoundCore.h" +#include "Speaker.h" //----------------------------------------------------------------------------- diff --git a/source/Speaker.cpp b/source/Speaker.cpp index 00d080a4..4b3c5fc7 100644 --- a/source/Speaker.cpp +++ b/source/Speaker.cpp @@ -29,6 +29,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include +#include "AppleWin.h" +#include "CPU.h" +#include "Frame.h" +#include "Memory.h" +#include "SoundCore.h" +#include "Speaker.h" +#include "Video.h" + +#include "Debugger\Debug.h" // For DWORD extbench + // Notes: // // [OLD: 23.191 Apple CLKs == 44100Hz (CLK_6502/44100)] diff --git a/source/StdAfx.h b/source/StdAfx.h index e4305592..f8140bc6 100644 --- a/source/StdAfx.h +++ b/source/StdAfx.h @@ -36,30 +36,4 @@ #include #include -#include "zlib.h" -#include "unzip.h" -#include "zip.h" -#include "iowin32.h" - -#include "Common.h" -#include "Structs.h" - -#include "AppleWin.h" -#include "AY8910.h" -#include "CPU.h" -#include "Video.h" // Debugger needs: VideoUpdateFuncPtr_t -#include "Debug.h" -#include "Disk.h" -#include "Frame.h" -#include "Keyboard.h" -#include "Log.h" -#include "Memory.h" -#include "Mockingboard.h" -#include "ParallelPrinter.h" -#include "Registry.h" -#include "Riff.h" -#include "SaveState.h" -#include "SerialComms.h" -#include "SoundCore.h" -#include "Speaker.h" -#include "Tape.h" +#define USE_SPEECH_API diff --git a/source/Structs.h b/source/Structs.h index 88bf6706..fde28edc 100644 --- a/source/Structs.h +++ b/source/Structs.h @@ -1,5 +1,6 @@ #pragma once +#include "Common.h" #include "DiskImage.h" // Structs used by save-state file diff --git a/source/Tape.cpp b/source/Tape.cpp index 1df06bc3..0aef7f03 100644 --- a/source/Tape.cpp +++ b/source/Tape.cpp @@ -30,6 +30,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" +#include "AppleWin.h" +#include "Keyboard.h" +#include "Memory.h" + static bool g_CapsLockAllowed = false; //--------------------------------------------------------------------------- diff --git a/source/Util_MemoryTextFile.cpp b/source/Util_MemoryTextFile.cpp index 817d64b5..041d1ca3 100644 --- a/source/Util_MemoryTextFile.cpp +++ b/source/Util_MemoryTextFile.cpp @@ -1,5 +1,29 @@ +/* +AppleWin : An Apple //e emulator for Windows + +Copyright (C) 1994-1996, Michael O'Brien +Copyright (C) 1999-2001, Oliver Schmidt +Copyright (C) 2002-2005, Tom Charlesworth +Copyright (C) 2006-2014, Tom Charlesworth, Michael Pohoreski + +AppleWin is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +AppleWin is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with AppleWin; if not, write to the Free Software +Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + #include "StdAfx.h" +#include "Debugger\Debug.h" // Debugger_Parser.h: SkipUntilEOL(), EatEOL(), CHAR_CR, CHAR_LF // MemoryTextFile _________________________________________________________________________________ diff --git a/source/Video.cpp b/source/Video.cpp index 61a4a094..7e5cc496 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -27,8 +27,19 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "StdAfx.h" + +#include "AppleWin.h" +#include "CPU.h" +#include "Disk.h" +#include "Frame.h" +#include "Keyboard.h" +#include "Memory.h" +#include "Registry.h" +#include "Video.h" + #include "..\resource\resource.h" #include "Configuration\PropertySheet.h" +#include "Debugger\Debugger_Color.h" // For NUM_DEBUG_COLORS #define HALF_PIXEL_SOLID 1 #define HALF_PIXEL_BLEED 0 diff --git a/source/Z80VICE/z80.cpp b/source/Z80VICE/z80.cpp index c7cae58c..fe8cdfe6 100644 --- a/source/Z80VICE/z80.cpp +++ b/source/Z80VICE/z80.cpp @@ -24,7 +24,11 @@ * */ -#include "..\stdafx.h" +#include "..\StdAfx.h" + +#include "..\AppleWin.h" +#include "..\CPU.h" +#include "..\Memory.h" #undef IN // Defined in windef.h diff --git a/source/z80emu.cpp b/source/z80emu.cpp index d55b52f7..932711e3 100644 --- a/source/z80emu.cpp +++ b/source/z80emu.cpp @@ -14,6 +14,9 @@ // Emula a CPU Z80 #include "StdAfx.h" + +#include "AppleWin.h" +#include "Memory.h" #include "z80emu.h" // Variaveis