diff --git a/AppleWinExpress2008.vcproj b/AppleWinExpress2008.vcproj index 8980c3d2..18162b3e 100644 --- a/AppleWinExpress2008.vcproj +++ b/AppleWinExpress2008.vcproj @@ -231,7 +231,7 @@ > - + diff --git a/AppleWinExpress2017.vcxproj.filters b/AppleWinExpress2017.vcxproj.filters index 2c67ba18..d5c2e1da 100644 --- a/AppleWinExpress2017.vcxproj.filters +++ b/AppleWinExpress2017.vcxproj.filters @@ -207,7 +207,7 @@ - + Source Files diff --git a/AppleWinExpress2019.vcxproj b/AppleWinExpress2019.vcxproj index 6a7e917f..7ec0c2b8 100644 --- a/AppleWinExpress2019.vcxproj +++ b/AppleWinExpress2019.vcxproj @@ -22,7 +22,7 @@ - + diff --git a/AppleWinExpress2019.vcxproj.filters b/AppleWinExpress2019.vcxproj.filters index ba7db783..5213f350 100644 --- a/AppleWinExpress2019.vcxproj.filters +++ b/AppleWinExpress2019.vcxproj.filters @@ -207,7 +207,7 @@ - + Source Files diff --git a/source/AY8910.cpp b/source/AY8910.cpp index 35e066b4..0b4e3338 100644 --- a/source/AY8910.cpp +++ b/source/AY8910.cpp @@ -28,7 +28,7 @@ #include "AY8910.h" -#include "Applewin.h" // For g_fh +#include "AppleWin.h" // For g_fh #include "YamlHelper.h" /* The AY white noise RNG algorithm is based on info from MAME's ay8910.c - diff --git a/source/Applewin.h b/source/AppleWin.h similarity index 100% rename from source/Applewin.h rename to source/AppleWin.h diff --git a/source/Applewin.cpp b/source/Applewin.cpp index bf9673d3..b7e86d57 100644 --- a/source/Applewin.cpp +++ b/source/Applewin.cpp @@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CardManager.h" #include "CPU.h" #include "Debug.h" diff --git a/source/CPU.cpp b/source/CPU.cpp index cc4ea779..b4eda4c0 100644 --- a/source/CPU.cpp +++ b/source/CPU.cpp @@ -87,7 +87,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "CPU.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CardManager.h" #include "Frame.h" #include "Memory.h" diff --git a/source/CardManager.cpp b/source/CardManager.cpp index 3b13f0fc..86e142ef 100644 --- a/source/CardManager.cpp +++ b/source/CardManager.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "CardManager.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Disk.h" #include "MouseInterface.h" diff --git a/source/Configuration/About.cpp b/source/Configuration/About.cpp index 3dbd7cc5..c0c55f58 100644 --- a/source/Configuration/About.cpp +++ b/source/Configuration/About.cpp @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "About.h" -#include "../Applewin.h" +#include "../AppleWin.h" #include "../Frame.h" #include "../resource/resource.h" diff --git a/source/Configuration/Config.h b/source/Configuration/Config.h index c9d9830c..cf7dd085 100644 --- a/source/Configuration/Config.h +++ b/source/Configuration/Config.h @@ -1,6 +1,6 @@ #pragma once -#include "../Applewin.h" +#include "../AppleWin.h" #include "../CardManager.h" #include "../CPU.h" #include "../DiskImage.h" // Disk_Status_e diff --git a/source/Configuration/PageConfig.cpp b/source/Configuration/PageConfig.cpp index 7e98c129..ddeeb225 100644 --- a/source/Configuration/PageConfig.cpp +++ b/source/Configuration/PageConfig.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "PageConfig.h" #include "PropertySheetHelper.h" -#include "../Applewin.h" +#include "../AppleWin.h" #include "../Frame.h" #include "../Registry.h" #include "../SerialComms.h" diff --git a/source/Configuration/PageDisk.cpp b/source/Configuration/PageDisk.cpp index f1ef999e..7357565c 100644 --- a/source/Configuration/PageDisk.cpp +++ b/source/Configuration/PageDisk.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "PageDisk.h" #include "PropertySheetHelper.h" -#include "../Applewin.h" +#include "../AppleWin.h" #include "../CardManager.h" #include "../Disk.h" // Drive_e, Disk_Status_e #include "../Frame.h" diff --git a/source/Configuration/PropertySheet.cpp b/source/Configuration/PropertySheet.cpp index 84385c56..f94c9271 100644 --- a/source/Configuration/PropertySheet.cpp +++ b/source/Configuration/PropertySheet.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "PropertySheet.h" -#include "../Applewin.h" +#include "../AppleWin.h" #include "../Frame.h" #include "../resource/resource.h" diff --git a/source/Configuration/PropertySheetHelper.cpp b/source/Configuration/PropertySheetHelper.cpp index 3c9be3d2..e49623d8 100644 --- a/source/Configuration/PropertySheetHelper.cpp +++ b/source/Configuration/PropertySheetHelper.cpp @@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "PropertySheetHelper.h" #include "IPropertySheet.h" -#include "../Applewin.h" // g_nAppMode, g_uScrollLockToggle, sg_PropertySheet +#include "../AppleWin.h" // g_nAppMode, g_uScrollLockToggle, sg_PropertySheet #include "../CardManager.h" #include "../Disk.h" #include "../Frame.h" diff --git a/source/Debugger/Debug.cpp b/source/Debugger/Debug.cpp index b0e5cc58..55e21ecd 100644 --- a/source/Debugger/Debug.cpp +++ b/source/Debugger/Debug.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Debug.h" #include "DebugDefs.h" -#include "../Applewin.h" +#include "../AppleWin.h" #include "../CardManager.h" #include "../CPU.h" #include "../Disk.h" diff --git a/source/Debugger/Debugger_Display.cpp b/source/Debugger/Debugger_Display.cpp index 7ed9b7eb..207a3652 100644 --- a/source/Debugger/Debugger_Display.cpp +++ b/source/Debugger/Debugger_Display.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Debug.h" #include "Debugger_Display.h" -#include "../Applewin.h" +#include "../AppleWin.h" #include "../CPU.h" #include "../Frame.h" #include "../LanguageCard.h" diff --git a/source/Debugger/Debugger_Help.cpp b/source/Debugger/Debugger_Help.cpp index 13cc066c..c81bd20f 100644 --- a/source/Debugger/Debugger_Help.cpp +++ b/source/Debugger/Debugger_Help.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Debug.h" -#include "../Applewin.h" +#include "../AppleWin.h" #define DEBUG_COLOR_CONSOLE 0 diff --git a/source/Debugger/Debugger_Symbols.cpp b/source/Debugger/Debugger_Symbols.cpp index d84ebcce..5f5e0160 100644 --- a/source/Debugger/Debugger_Symbols.cpp +++ b/source/Debugger/Debugger_Symbols.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Debug.h" -#include "../Applewin.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 226672a6..6142d266 100644 --- a/source/Disk.cpp +++ b/source/Disk.cpp @@ -34,7 +34,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "SaveState_Structs_v1.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CPU.h" #include "DiskImage.h" #include "Frame.h" diff --git a/source/Disk2CardManager.cpp b/source/Disk2CardManager.cpp index 4e1d18a6..11122242 100644 --- a/source/Disk2CardManager.cpp +++ b/source/Disk2CardManager.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Disk2CardManager.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CardManager.h" #include "Disk.h" diff --git a/source/Frame.cpp b/source/Frame.cpp index e40d9edc..f2e88214 100644 --- a/source/Frame.cpp +++ b/source/Frame.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Frame.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CardManager.h" #include "CPU.h" #include "Disk.h" diff --git a/source/Harddisk.cpp b/source/Harddisk.cpp index c13b556f..537be4dd 100644 --- a/source/Harddisk.cpp +++ b/source/Harddisk.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Harddisk.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CardManager.h" #include "CPU.h" #include "DiskImage.h" // ImageError_e, Disk_Status_e diff --git a/source/Joystick.cpp b/source/Joystick.cpp index 1c1573b5..5ed22b1b 100644 --- a/source/Joystick.cpp +++ b/source/Joystick.cpp @@ -40,7 +40,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Joystick.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CPU.h" #include "Memory.h" #include "YamlHelper.h" diff --git a/source/Keyboard.cpp b/source/Keyboard.cpp index abd14a50..a534e794 100644 --- a/source/Keyboard.cpp +++ b/source/Keyboard.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Keyboard.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Frame.h" #include "Pravets.h" #include "Tape.h" diff --git a/source/LanguageCard.cpp b/source/LanguageCard.cpp index c24974ec..15efb773 100644 --- a/source/LanguageCard.cpp +++ b/source/LanguageCard.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "LanguageCard.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CPU.h" // GH#700 #include "Log.h" #include "Memory.h" diff --git a/source/Memory.cpp b/source/Memory.cpp index 7628c4ce..aa3d4cae 100644 --- a/source/Memory.cpp +++ b/source/Memory.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Memory.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CardManager.h" #include "CPU.h" #include "Disk.h" diff --git a/source/Mockingboard.cpp b/source/Mockingboard.cpp index fafea58b..7df2e36b 100644 --- a/source/Mockingboard.cpp +++ b/source/Mockingboard.cpp @@ -80,7 +80,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Mockingboard.h" #include "SaveState_Structs_v1.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CardManager.h" #include "CPU.h" #include "Log.h" diff --git a/source/MouseInterface.cpp b/source/MouseInterface.cpp index ed896dd0..84d7f0cc 100644 --- a/source/MouseInterface.cpp +++ b/source/MouseInterface.cpp @@ -46,7 +46,7 @@ Etc. #include "SaveState_Structs_common.h" #include "Common.h" -#include "Applewin.h" // g_SynchronousEventMgr +#include "AppleWin.h" // g_SynchronousEventMgr #include "CardManager.h" #include "CPU.h" #include "Frame.h" // FrameSetCursorPosByMousePos() diff --git a/source/NTSC.cpp b/source/NTSC.cpp index 2260bb30..c96aa418 100644 --- a/source/NTSC.cpp +++ b/source/NTSC.cpp @@ -22,7 +22,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Includes #include "StdAfx.h" #include "NTSC.h" - #include "Applewin.h" + #include "AppleWin.h" #include "CPU.h" // CpuGetCyclesThisVideoFrame() #include "Frame.h" #include "Memory.h" // MemGetMainPtr(), MemGetAuxPtr(), MemGetAnnunciator() diff --git a/source/NTSC_CharSet.cpp b/source/NTSC_CharSet.cpp index ff223e5e..745c1032 100644 --- a/source/NTSC_CharSet.cpp +++ b/source/NTSC_CharSet.cpp @@ -21,7 +21,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "NTSC_CharSet.h" -#include "Applewin.h" +#include "AppleWin.h" #include "../resource/resource.h" #include "Video.h" diff --git a/source/ParallelPrinter.cpp b/source/ParallelPrinter.cpp index c0978d34..5c511394 100644 --- a/source/ParallelPrinter.cpp +++ b/source/ParallelPrinter.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "ParallelPrinter.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Frame.h" // g_hFrameWindow #include "Memory.h" #include "Registry.h" diff --git a/source/Pravets.cpp b/source/Pravets.cpp index cb1e684a..66b90da1 100644 --- a/source/Pravets.cpp +++ b/source/Pravets.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Pravets.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Frame.h" #include "Keyboard.h" #include "Tape.h" diff --git a/source/SAM.cpp b/source/SAM.cpp index c255590d..19b684a8 100644 --- a/source/SAM.cpp +++ b/source/SAM.cpp @@ -33,7 +33,7 @@ #include "StdAfx.h" #include "SAM.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Memory.h" #include "Speaker.h" diff --git a/source/SaveState.cpp b/source/SaveState.cpp index 7c63427d..92991452 100644 --- a/source/SaveState.cpp +++ b/source/SaveState.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "SaveState.h" #include "YamlHelper.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CardManager.h" #include "CPU.h" #include "Debug.h" diff --git a/source/SerialComms.cpp b/source/SerialComms.cpp index 444abeb2..b7c5bfa8 100644 --- a/source/SerialComms.cpp +++ b/source/SerialComms.cpp @@ -36,7 +36,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "SerialComms.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CPU.h" #include "Frame.h" #include "Log.h" diff --git a/source/SoundCore.cpp b/source/SoundCore.cpp index 17fd4b3d..3cffc649 100644 --- a/source/SoundCore.cpp +++ b/source/SoundCore.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "SoundCore.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Frame.h" #include "Log.h" #include "Speaker.h" diff --git a/source/Speaker.cpp b/source/Speaker.cpp index 3c94fbfa..42f693ef 100644 --- a/source/Speaker.cpp +++ b/source/Speaker.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Speaker.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CPU.h" #include "Frame.h" #include "Log.h" diff --git a/source/SynchronousEventManager.cpp b/source/SynchronousEventManager.cpp index 0faa2b57..ceba4a9b 100644 --- a/source/SynchronousEventManager.cpp +++ b/source/SynchronousEventManager.cpp @@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "SynchronousEventManager.h" -#include "Applewin.h" +#include "AppleWin.h" void SynchronousEventManager::Insert(SyncEvent* pNewEvent) { diff --git a/source/Tape.cpp b/source/Tape.cpp index 6f267e4f..f597ef7c 100644 --- a/source/Tape.cpp +++ b/source/Tape.cpp @@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Tape.h" -#include "Applewin.h" +#include "AppleWin.h" #include "Keyboard.h" #include "Memory.h" #include "Pravets.h" diff --git a/source/Video.cpp b/source/Video.cpp index 74e4a8a8..59d3e152 100644 --- a/source/Video.cpp +++ b/source/Video.cpp @@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" #include "Video.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CPU.h" #include "Disk.h" // DiskUpdateDriveState() #include "Frame.h" diff --git a/source/Z80VICE/z80.cpp b/source/Z80VICE/z80.cpp index 27563cb4..75989b92 100644 --- a/source/Z80VICE/z80.cpp +++ b/source/Z80VICE/z80.cpp @@ -26,7 +26,7 @@ #include "../StdAfx.h" -#include "../Applewin.h" +#include "../AppleWin.h" #include "../CPU.h" #include "../Memory.h" #include "../YamlHelper.h" diff --git a/source/z80emu.cpp b/source/z80emu.cpp index b60d707a..d177bf19 100644 --- a/source/z80emu.cpp +++ b/source/z80emu.cpp @@ -16,7 +16,7 @@ #include "StdAfx.h" #include "z80emu.h" -#include "Applewin.h" +#include "AppleWin.h" #include "CPU.h" #include "Memory.h" diff --git a/test/TestCPU6502/TestCPU6502.cpp b/test/TestCPU6502/TestCPU6502.cpp index 3a248699..445880d5 100644 --- a/test/TestCPU6502/TestCPU6502.cpp +++ b/test/TestCPU6502/TestCPU6502.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" -#include "../../source/Applewin.h" +#include "../../source/AppleWin.h" #include "../../source/CPU.h" #include "../../source/Memory.h" #include "../../source/SynchronousEventManager.h"