From 26f4532cb821c4cf2a6c5c15bd82acbfb96baf42 Mon Sep 17 00:00:00 2001 From: Andrea Odetti Date: Tue, 16 May 2017 09:02:48 +0100 Subject: [PATCH] Minimal changes to ensure compilation in Linux / gcc. Signed-off-by: Andrea Odetti --- source/CPU.cpp | 16 +++++------ source/CPU/cpu65d02.h | 2 +- source/CommonVICE/alarm.h | 2 +- source/CommonVICE/interrupt.h | 2 +- source/CommonVICE/mem.h | 2 +- source/Configuration/Config.h | 8 +++--- source/Configuration/PageConfigTfe.h | 2 +- source/Configuration/PageInput.h | 2 +- source/Disk.cpp | 10 +++---- source/Disk.h | 2 +- source/DiskImage.cpp | 2 +- source/DiskImageHelper.cpp | 42 +++++++++++++--------------- source/DiskImageHelper.h | 6 ++-- source/Harddisk.cpp | 10 +++---- source/Memory.cpp | 12 ++++---- source/ParallelPrinter.cpp | 6 ++-- source/Pravets.cpp | 2 +- source/SAM.cpp | 2 +- source/Tape.cpp | 2 +- source/Z80VICE/daa.cpp | 2 +- source/Z80VICE/daa.h | 2 +- source/Z80VICE/z80.cpp | 20 ++++++------- source/Z80VICE/z80mem.cpp | 2 +- source/Z80VICE/z80mem.h | 4 +-- source/Z80VICE/z80regs.h | 2 +- source/z80emu.cpp | 2 +- 26 files changed, 82 insertions(+), 84 deletions(-) diff --git a/source/CPU.cpp b/source/CPU.cpp index 402ca743..301ff3d2 100644 --- a/source/CPU.cpp +++ b/source/CPU.cpp @@ -86,7 +86,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" -#include "AppleWin.h" +#include "Applewin.h" #include "CPU.h" #include "Frame.h" #include "Memory.h" @@ -99,8 +99,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "NTSC.h" #include "z80emu.h" -#include "Z80VICE\z80.h" -#include "Z80VICE\z80mem.h" +#include "Z80VICE/z80.h" +#include "Z80VICE/z80mem.h" #include "YamlHelper.h" @@ -195,9 +195,9 @@ void SetActiveCpu(eCpuType cpu) // -#include "cpu/cpu_general.inl" +#include "CPU/cpu_general.inl" -#include "cpu/cpu_instructions.inl" +#include "CPU/cpu_instructions.inl" // Break into debugger on invalid opcodes //#define INV IsDebugBreakOnInvalid(AM_1); @@ -429,9 +429,9 @@ static __forceinline void CheckInterruptSources(ULONG uExecutedCycles) //=========================================================================== -#include "cpu/cpu6502.h" // MOS 6502 -#include "cpu/cpu65C02.h" // WDC 65C02 -#include "cpu/cpu65d02.h" // Debug CPU Memory Visualizer +#include "CPU/cpu6502.h" // MOS 6502 +#include "CPU/cpu65C02.h" // WDC 65C02 +#include "CPU/cpu65d02.h" // Debug CPU Memory Visualizer //=========================================================================== diff --git a/source/CPU/cpu65d02.h b/source/CPU/cpu65d02.h index 7161f824..e7e5b2e9 100644 --- a/source/CPU/cpu65d02.h +++ b/source/CPU/cpu65d02.h @@ -91,7 +91,7 @@ inline u8 ReadByte( u16 addr, int uExecutedCycles ) IOWrite[(addr>>4) & 0xFF](regs.pc,addr,1,(BYTE)(a),uExecutedCycles); \ } -#include "cpu/cpu_instructions.inl" +#include "CPU/cpu_instructions.inl" //=========================================================================== diff --git a/source/CommonVICE/alarm.h b/source/CommonVICE/alarm.h index ea166f2b..85cb12de 100644 --- a/source/CommonVICE/alarm.h +++ b/source/CommonVICE/alarm.h @@ -28,7 +28,7 @@ #ifndef _ALARM_H #define _ALARM_H -#include "..\CommonVICE\types.h" +#include "CommonVICE/types.h" #define ALARM_CONTEXT_MAX_PENDING_ALARMS 0x100 diff --git a/source/CommonVICE/interrupt.h b/source/CommonVICE/interrupt.h index 2961a0b5..889f6be6 100644 --- a/source/CommonVICE/interrupt.h +++ b/source/CommonVICE/interrupt.h @@ -31,7 +31,7 @@ #include -#include "..\CommonVICE\types.h" +#include "CommonVICE/types.h" /* Define the number of cycles needed by the CPU to detect the NMI or IRQ. */ #define INTERRUPT_DELAY 2 diff --git a/source/CommonVICE/mem.h b/source/CommonVICE/mem.h index 26f1a4b9..4553f12d 100644 --- a/source/CommonVICE/mem.h +++ b/source/CommonVICE/mem.h @@ -29,7 +29,7 @@ #ifndef _MEM_H_ #define _MEM_H_ -#include "..\CommonVICE\types.h" +#include "CommonVICE/types.h" typedef BYTE REGPARM1 read_func_t(WORD addr); typedef read_func_t *read_func_ptr_t; diff --git a/source/Configuration/Config.h b/source/Configuration/Config.h index 36be83af..e514d8b3 100644 --- a/source/Configuration/Config.h +++ b/source/Configuration/Config.h @@ -1,9 +1,9 @@ #pragma once -#include "..\AppleWin.h" -#include "..\CPU.h" -#include "..\Disk.h" // BOOL enhancedisk -#include "..\HardDisk.h" // HD_CardIsEnabled() +#include "Applewin.h" +#include "CPU.h" +#include "Disk.h" // BOOL enhancedisk +#include "Harddisk.h" // HD_CardIsEnabled() class CConfigNeedingRestart { diff --git a/source/Configuration/PageConfigTfe.h b/source/Configuration/PageConfigTfe.h index 96388d4a..5225fcfa 100644 --- a/source/Configuration/PageConfigTfe.h +++ b/source/Configuration/PageConfigTfe.h @@ -1,7 +1,7 @@ #pragma once #include "IPropertySheetPage.h" -#include "..\Tfe\Uilib.h" +#include "Tfe/Uilib.h" class CPageConfigTfe : private IPropertySheetPage { diff --git a/source/Configuration/PageInput.h b/source/Configuration/PageInput.h index 163606f8..5ccca6f5 100644 --- a/source/Configuration/PageInput.h +++ b/source/Configuration/PageInput.h @@ -2,7 +2,7 @@ #include "IPropertySheetPage.h" #include "PropertySheetDefs.h" -#include "..\Joystick.h" +#include "Joystick.h" class CPropertySheetHelper; class CConfigNeedingRestart; diff --git a/source/Disk.cpp b/source/Disk.cpp index 1539167c..312b9785 100644 --- a/source/Disk.cpp +++ b/source/Disk.cpp @@ -32,7 +32,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 "Disk.h" #include "DiskImage.h" #include "Frame.h" @@ -42,7 +42,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Video.h" #include "YamlHelper.h" -#include "..\resource\resource.h" +#include "../resource/resource.h" #define LOG_DISK_ENABLED 0 #define LOG_DISK_TRACKS 1 @@ -144,7 +144,7 @@ const char* DiskGetDiskPathFilename(const int iDrive) return g_aFloppyDisk[iDrive].fullname; } -char* DiskGetCurrentState(void) +const char* DiskGetCurrentState(void) { if (g_aFloppyDisk[currdrive].imagehandle == NULL) return "Empty"; @@ -186,7 +186,7 @@ void Disk_LoadLastDiskImage(const int iDrive) char sFilePath[ MAX_PATH + 1]; sFilePath[0] = 0; - char *pRegKey = (iDrive == DRIVE_1) + const char *pRegKey = (iDrive == DRIVE_1) ? REGVALUE_PREF_LAST_DISK_1 : REGVALUE_PREF_LAST_DISK_2; @@ -1333,7 +1333,7 @@ static void DiskLoadSnapshotDriveUnit(YamlLoadHelper& yamlLoadHelper, UINT unit) g_aFloppyDisk[unit].trackimagedata = yamlLoadHelper.LoadUint(SS_YAML_KEY_TRACK_IMAGE_DATA); g_aFloppyDisk[unit].trackimagedirty = yamlLoadHelper.LoadUint(SS_YAML_KEY_TRACK_IMAGE_DIRTY); - std::auto_ptr pTrack( new BYTE [NIBBLES_PER_TRACK] ); + std::shared_ptr pTrack( new BYTE [NIBBLES_PER_TRACK] ); memset(pTrack.get(), 0, NIBBLES_PER_TRACK); if (yamlLoadHelper.GetSubMap(SS_YAML_KEY_TRACK_IMAGE)) { diff --git a/source/Disk.h b/source/Disk.h index 95d8f7e2..06d7a616 100644 --- a/source/Disk.h +++ b/source/Disk.h @@ -65,7 +65,7 @@ int DiskGetCurrentTrack(); int DiskGetTrack( int drive ); int DiskGetCurrentPhase(); int DiskGetCurrentOffset(); -char* DiskGetCurrentState(); +const char* DiskGetCurrentState(); bool DiskSelect(const int iDrive); void DiskUpdatePosition(DWORD); bool DiskDriveSwap(void); diff --git a/source/DiskImage.cpp b/source/DiskImage.cpp index 3db7b727..6640124c 100644 --- a/source/DiskImage.cpp +++ b/source/DiskImage.cpp @@ -236,7 +236,7 @@ bool ImageIsMultiFileZip(ImageInfo* const pImageInfo) const char* ImageGetPathname(ImageInfo* const pImageInfo) { - static char* szEmpty = ""; + static const char* szEmpty = ""; return pImageInfo ? pImageInfo->szFilename : szEmpty; } diff --git a/source/DiskImageHelper.cpp b/source/DiskImageHelper.cpp index d631c597..fdb1198c 100644 --- a/source/DiskImageHelper.cpp +++ b/source/DiskImageHelper.cpp @@ -27,12 +27,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#include "stdafx.h" +#include "StdAfx.h" #include "Common.h" #include "zlib.h" -#include "unzip.h" -#include "iowin32.h" +#include "minizip/unzip.h" #include "CPU.h" #include "Disk.h" @@ -633,8 +632,8 @@ public: virtual UINT GetImageSizeForCreate(void) { return TRACK_DENIBBLIZED_SIZE * TRACKS_STANDARD; } virtual eImageType GetType(void) { return eImageDO; } - virtual char* GetCreateExtensions(void) { return ".do;.dsk"; } - virtual char* GetRejectExtensions(void) { return ".nib;.iie;.po;.prg"; } + virtual const char* GetCreateExtensions(void) { return ".do;.dsk"; } + virtual const char* GetRejectExtensions(void) { return ".nib;.iie;.po;.prg"; } }; //------------------------------------- @@ -697,8 +696,8 @@ public: } virtual eImageType GetType(void) { return eImagePO; } - virtual char* GetCreateExtensions(void) { return ".po"; } - virtual char* GetRejectExtensions(void) { return ".do;.iie;.nib;.prg"; } + virtual const char* GetCreateExtensions(void) { return ".po"; } + virtual const char* GetRejectExtensions(void) { return ".do;.iie;.nib;.prg"; } }; //------------------------------------- @@ -737,8 +736,8 @@ public: virtual UINT GetImageSizeForCreate(void) { return NIB1_TRACK_SIZE * TRACKS_STANDARD; } virtual eImageType GetType(void) { return eImageNIB1; } - virtual char* GetCreateExtensions(void) { return ".nib"; } - virtual char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg"; } + virtual const char* GetCreateExtensions(void) { return ".nib"; } + virtual const char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg"; } }; //------------------------------------- @@ -774,8 +773,8 @@ public: } virtual eImageType GetType(void) { return eImageNIB2; } - virtual char* GetCreateExtensions(void) { return ".nb2"; } - virtual char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg;.2mg;.2img"; } + virtual const char* GetCreateExtensions(void) { return ".nb2"; } + virtual const char* GetRejectExtensions(void) { return ".do;.iie;.po;.prg;.2mg;.2img"; } }; //------------------------------------- @@ -815,8 +814,8 @@ public: } virtual eImageType GetType(void) { return eImageHDV; } - virtual char* GetCreateExtensions(void) { return ".hdv"; } - virtual char* GetRejectExtensions(void) { return ".do;.iie;.prg"; } + virtual const char* GetCreateExtensions(void) { return ".hdv"; } + virtual const char* GetRejectExtensions(void) { return ".do;.iie;.prg"; } }; //------------------------------------- @@ -884,8 +883,8 @@ public: } virtual eImageType GetType(void) { return eImageIIE; } - virtual char* GetCreateExtensions(void) { return ".iie"; } - virtual char* GetRejectExtensions(void) { return ".do.;.nib;.po;.prg;.2mg;.2img"; } + virtual const char* GetCreateExtensions(void) { return ".iie"; } + virtual const char* GetRejectExtensions(void) { return ".do.;.nib;.po;.prg;.2mg;.2img"; } private: void ConvertSectorOrder(LPBYTE sourceorder) @@ -958,8 +957,8 @@ public: virtual bool AllowRW(void) { return false; } virtual eImageType GetType(void) { return eImageAPL; } - virtual char* GetCreateExtensions(void) { return ".apl"; } - virtual char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; } + virtual const char* GetCreateExtensions(void) { return ".apl"; } + virtual const char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; } }; //------------------------------------- @@ -1009,8 +1008,8 @@ public: virtual bool AllowRW(void) { return false; } virtual eImageType GetType(void) { return eImagePRG; } - virtual char* GetCreateExtensions(void) { return ".prg"; } - virtual char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; } + virtual const char* GetCreateExtensions(void) { return ".prg"; } + virtual const char* GetRejectExtensions(void) { return ".do;.dsk;.iie;.nib;.po;.2mg;.2img"; } }; //----------------------------------------------------------------------------- @@ -1194,10 +1193,7 @@ ImageError_e CImageHelperBase::CheckGZipFile(LPCTSTR pszImageFilename, ImageInfo ImageError_e CImageHelperBase::CheckZipFile(LPCTSTR pszImageFilename, ImageInfo* pImageInfo, std::string& strFilenameInZip) { - zlib_filefunc_def ffunc; - fill_win32_filefunc(&ffunc); // TODO: Ditch this and use unzOpen() instead? - - unzFile hZipFile = unzOpen2(pszImageFilename, &ffunc); + unzFile hZipFile = unzOpen(pszImageFilename); if (hZipFile == NULL) return eIMAGE_ERROR_UNABLE_TO_OPEN_ZIP; diff --git a/source/DiskImageHelper.h b/source/DiskImageHelper.h index 01a07b49..b892b900 100644 --- a/source/DiskImageHelper.h +++ b/source/DiskImageHelper.h @@ -1,6 +1,6 @@ #pragma once -#include "zip.h" +#include "minizip/zip.h" #define GZ_SUFFIX ".gz" #define GZ_SUFFIX_LEN (sizeof(GZ_SUFFIX)-1) @@ -64,8 +64,8 @@ public: virtual UINT GetImageSizeForCreate(void) { _ASSERT(0); return (UINT)-1; } virtual eImageType GetType(void) = 0; - virtual char* GetCreateExtensions(void) = 0; - virtual char* GetRejectExtensions(void) = 0; + virtual const char* GetCreateExtensions(void) = 0; + virtual const char* GetRejectExtensions(void) = 0; void SetVolumeNumber(const BYTE uVolumeNumber) { m_uVolumeNumber = uVolumeNumber; } bool IsValidImageSize(const DWORD uImageSize); diff --git a/source/Harddisk.cpp b/source/Harddisk.cpp index f17af3cd..aebef116 100644 --- a/source/Harddisk.cpp +++ b/source/Harddisk.cpp @@ -28,16 +28,16 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" -#include "AppleWin.h" +#include "Applewin.h" #include "DiskImage.h" // ImageError_e, Disk_Status_e #include "DiskImageHelper.h" #include "Frame.h" -#include "HardDisk.h" +#include "Harddisk.h" #include "Memory.h" #include "Registry.h" #include "YamlHelper.h" -#include "..\resource\resource.h" +#include "../resource/resource.h" /* Memory map: @@ -187,7 +187,7 @@ void HD_LoadLastDiskImage(const int iDrive) char sFilePath[ MAX_PATH + 1]; sFilePath[0] = 0; - char *pRegKey = (iDrive == HARDDISK_1) + const char *pRegKey = (iDrive == HARDDISK_1) ? REGVALUE_PREF_LAST_HARDDISK_1 : REGVALUE_PREF_LAST_HARDDISK_2; @@ -331,7 +331,7 @@ void HD_Destroy(void) } // pszImageFilename is qualified with path -static BOOL HD_Insert(const int iDrive, LPCTSTR pszImageFilename) +BOOL HD_Insert(const int iDrive, LPCTSTR pszImageFilename) { if (*pszImageFilename == 0x00) return FALSE; diff --git a/source/Memory.cpp b/source/Memory.cpp index 64aa3a12..dfaeb6e0 100644 --- a/source/Memory.cpp +++ b/source/Memory.cpp @@ -30,7 +30,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" -#include "AppleWin.h" +#include "Applewin.h" #include "CPU.h" #include "Disk.h" #include "Frame.h" @@ -51,10 +51,10 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "Video.h" #include "z80emu.h" -#include "Z80VICE\z80.h" -#include "..\resource\resource.h" -#include "Configuration\PropertySheet.h" -#include "Debugger\DebugDefs.h" +#include "Z80VICE/z80.h" +#include "../resource/resource.h" +#include "Configuration/IPropertySheet.h" +#include "Debugger/DebugDefs.h" #include "YamlHelper.h" #define SW_80STORE (memmode & MF_80STORE) @@ -1239,6 +1239,8 @@ void MemInitialize() g_pAppTitle, MB_ICONEXCLAMATION | MB_SETFOREGROUND); + memimage = (LPBYTE)newloc; + #ifdef RAMWORKS // allocate memory for RAMWorks III - up to 8MB g_uActiveBank = 0; diff --git a/source/ParallelPrinter.cpp b/source/ParallelPrinter.cpp index f17609db..71609517 100644 --- a/source/ParallelPrinter.cpp +++ b/source/ParallelPrinter.cpp @@ -28,13 +28,13 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" -#include "AppleWin.h" +#include "Applewin.h" #include "Memory.h" #include "ParallelPrinter.h" #include "Registry.h" #include "YamlHelper.h" -#include "..\resource\resource.h" +#include "../resource/resource.h" static DWORD inactivity = 0; static unsigned int g_PrinterIdleLimit = 10; @@ -169,7 +169,7 @@ static BYTE __stdcall PrintTransmit(WORD, WORD, BYTE, BYTE value, ULONG) return 0; } - char c = NULL; + char c = 0; if ((g_Apple2Type == A2TYPE_PRAVETS8A) && g_bConvertEncoding) //This is print conversion for Pravets 8A/C. Print conversion for Pravets82/M is still to be done. { if ((value > 90) && (value < 128)) //This range shall be set more precisely diff --git a/source/Pravets.cpp b/source/Pravets.cpp index 296cf4f7..a216c62c 100644 --- a/source/Pravets.cpp +++ b/source/Pravets.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 "Frame.h" #include "Keyboard.h" #include "Tape.h" diff --git a/source/SAM.cpp b/source/SAM.cpp index 2fa4c420..84a56ed4 100644 --- a/source/SAM.cpp +++ b/source/SAM.cpp @@ -32,7 +32,7 @@ */ #include "StdAfx.h" -#include "AppleWin.h" +#include "Applewin.h" #include "Memory.h" #include "SAM.h" #include "Speaker.h" diff --git a/source/Tape.cpp b/source/Tape.cpp index 76eb8084..cbf437f2 100644 --- a/source/Tape.cpp +++ b/source/Tape.cpp @@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "StdAfx.h" -#include "AppleWin.h" +#include "Applewin.h" #include "Keyboard.h" #include "Memory.h" #include "Pravets.h" diff --git a/source/Z80VICE/daa.cpp b/source/Z80VICE/daa.cpp index 6618c479..9430854d 100644 --- a/source/Z80VICE/daa.cpp +++ b/source/Z80VICE/daa.cpp @@ -25,7 +25,7 @@ */ #include "daa.h" -#include "..\CommonVICE\types.h" // [AppleWin-TC] +#include "CommonVICE/types.h" // [AppleWin-TC] const BYTE daa_reg_a[2048] = { diff --git a/source/Z80VICE/daa.h b/source/Z80VICE/daa.h index ede77b9f..cca4c962 100644 --- a/source/Z80VICE/daa.h +++ b/source/Z80VICE/daa.h @@ -27,7 +27,7 @@ #ifndef _DAA_H #define _DAA_H -#include "..\CommonVICE\types.h" // [AppleWin-TC] +#include "CommonVICE/types.h" // [AppleWin-TC] extern const BYTE daa_reg_a[]; extern const BYTE daa_reg_f[]; diff --git a/source/Z80VICE/z80.cpp b/source/Z80VICE/z80.cpp index 7738cb40..0e3fd68f 100644 --- a/source/Z80VICE/z80.cpp +++ b/source/Z80VICE/z80.cpp @@ -24,12 +24,12 @@ * */ -#include "..\StdAfx.h" +#include "StdAfx.h" -#include "..\AppleWin.h" -#include "..\CPU.h" -#include "..\Memory.h" -#include "..\YamlHelper.h" +#include "Applewin.h" +#include "CPU.h" +#include "Memory.h" +#include "YamlHelper.h" #undef IN // Defined in windef.h @@ -39,15 +39,15 @@ #include -#include "..\CommonVICE\6510core.h" // [AppleWin-TC] -#include "..\CommonVICE\alarm.h" +#include "CommonVICE/6510core.h" // [AppleWin-TC] +#include "CommonVICE/alarm.h" #include "daa.h" //#include "debug.h" // [AppleWin-TC] -#include "..\CommonVICE\interrupt.h" +#include "CommonVICE/interrupt.h" //#include "log.h" // [AppleWin-TC] //#include "maincpu.h" // [AppleWin-TC] //#include "monitor.h" // [AppleWin-TC] -#include "..\CommonVICE\types.h" +#include "CommonVICE/types.h" #include "z80.h" #include "z80mem.h" #include "z80regs.h" @@ -55,7 +55,7 @@ /*#define DEBUG_Z80*/ -static CLOCK maincpu_clk = 0; // [AppleWin-TC] +CLOCK maincpu_clk = 0; // [AppleWin-TC] static BYTE reg_a = 0; static BYTE reg_b = 0; diff --git a/source/Z80VICE/z80mem.cpp b/source/Z80VICE/z80mem.cpp index d9e21d1b..61015a2f 100644 --- a/source/Z80VICE/z80mem.cpp +++ b/source/Z80VICE/z80mem.cpp @@ -44,7 +44,7 @@ //#include "vdc.h" //#include "vicii-mem.h" //#include "vicii.h" -#include "..\CommonVICE\types.h" // [AppleWin-TC] +#include "CommonVICE/types.h" // [AppleWin-TC] #include "z80mem.h" #include "z80.h" // [AppleWin-TC] Added for z80_RDMEM() & z80_WRMEM diff --git a/source/Z80VICE/z80mem.h b/source/Z80VICE/z80mem.h index fc374d7f..673f677e 100644 --- a/source/Z80VICE/z80mem.h +++ b/source/Z80VICE/z80mem.h @@ -30,10 +30,10 @@ #ifdef WATCOM_COMPILE #include "../mem.h" #else -#include "..\CommonVICE\mem.h" // [AppleWin-TC] +#include "CommonVICE/mem.h" // [AppleWin-TC] #endif -#include "..\CommonVICE\types.h" // [AppleWin-TC] +#include "CommonVICE/types.h" // [AppleWin-TC] extern int z80mem_resources_init(void); extern int z80mem_cmdline_options_init(void); diff --git a/source/Z80VICE/z80regs.h b/source/Z80VICE/z80regs.h index 54c59e81..23124daf 100644 --- a/source/Z80VICE/z80regs.h +++ b/source/Z80VICE/z80regs.h @@ -27,7 +27,7 @@ #ifndef _Z80REGS_H #define _Z80REGS_H -#include "..\CommonVICE\types.h" // [AppleWin-TC] +#include "CommonVICE/types.h" // [AppleWin-TC] typedef struct z80_regs_s { WORD reg_af; diff --git a/source/z80emu.cpp b/source/z80emu.cpp index 01542099..a60f5bd1 100644 --- a/source/z80emu.cpp +++ b/source/z80emu.cpp @@ -15,7 +15,7 @@ #include "StdAfx.h" -#include "AppleWin.h" +#include "Applewin.h" #include "CPU.h" #include "Memory.h" #include "z80emu.h"