diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.hpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.hpp index 47b10cf17..2441f28d5 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.hpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../../Machines/DynamicMachine.hpp" -#include "../../../../Configurable/Configurable.hpp" +#include "Machines/DynamicMachine.hpp" +#include "Configurable/Configurable.hpp" #include #include diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.hpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.hpp index 6a68fb2b5..b63ed3a53 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.hpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../../../../Machines/DynamicMachine.hpp" +#include "Machines/DynamicMachine.hpp" #include #include diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.hpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.hpp index b1b21eab8..880e2f91d 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.hpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../../Machines/DynamicMachine.hpp" -#include "../../../../Machines/KeyboardMachine.hpp" +#include "Machines/DynamicMachine.hpp" +#include "Machines/KeyboardMachine.hpp" #include #include diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.hpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.hpp index 5e2692e5f..f8749750e 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.hpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../../Machines/MediaTarget.hpp" -#include "../../../../Machines/DynamicMachine.hpp" +#include "Machines/MediaTarget.hpp" +#include "Machines/DynamicMachine.hpp" #include #include diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiProducer.hpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiProducer.hpp index a69291d00..bb6c3af44 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiProducer.hpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiProducer.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../../../Concurrency/AsyncTaskQueue.hpp" -#include "../../../../Machines/MachineTypes.hpp" -#include "../../../../Machines/DynamicMachine.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" +#include "Machines/MachineTypes.hpp" +#include "Machines/DynamicMachine.hpp" #include "MultiSpeaker.hpp" diff --git a/Analyser/Dynamic/MultiMachine/Implementation/MultiSpeaker.hpp b/Analyser/Dynamic/MultiMachine/Implementation/MultiSpeaker.hpp index 2e44e4de5..b4480df0a 100644 --- a/Analyser/Dynamic/MultiMachine/Implementation/MultiSpeaker.hpp +++ b/Analyser/Dynamic/MultiMachine/Implementation/MultiSpeaker.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../../Machines/DynamicMachine.hpp" -#include "../../../../Outputs/Speaker/Speaker.hpp" +#include "Machines/DynamicMachine.hpp" +#include "Outputs/Speaker/Speaker.hpp" #include #include diff --git a/Analyser/Dynamic/MultiMachine/MultiMachine.cpp b/Analyser/Dynamic/MultiMachine/MultiMachine.cpp index 562df1b0c..5d9f43176 100644 --- a/Analyser/Dynamic/MultiMachine/MultiMachine.cpp +++ b/Analyser/Dynamic/MultiMachine/MultiMachine.cpp @@ -7,7 +7,7 @@ // #include "MultiMachine.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" #include diff --git a/Analyser/Dynamic/MultiMachine/MultiMachine.hpp b/Analyser/Dynamic/MultiMachine/MultiMachine.hpp index ac2679fff..5e8e4835e 100644 --- a/Analyser/Dynamic/MultiMachine/MultiMachine.hpp +++ b/Analyser/Dynamic/MultiMachine/MultiMachine.hpp @@ -8,14 +8,14 @@ #pragma once -#include "../../../Machines/DynamicMachine.hpp" +#include "Machines/DynamicMachine.hpp" -#include "Implementation/MultiProducer.hpp" -#include "Implementation/MultiConfigurable.hpp" -#include "Implementation/MultiProducer.hpp" -#include "Implementation/MultiJoystickMachine.hpp" -#include "Implementation/MultiKeyboardMachine.hpp" -#include "Implementation/MultiMediaTarget.hpp" +#include "Analyser/Dynamic/MultiMachine/Implementation/MultiProducer.hpp" +#include "Analyser/Dynamic/MultiMachine/Implementation/MultiConfigurable.hpp" +#include "Analyser/Dynamic/MultiMachine/Implementation/MultiProducer.hpp" +#include "Analyser/Dynamic/MultiMachine/Implementation/MultiJoystickMachine.hpp" +#include "Analyser/Dynamic/MultiMachine/Implementation/MultiKeyboardMachine.hpp" +#include "Analyser/Dynamic/MultiMachine/Implementation/MultiMediaTarget.hpp" #include #include diff --git a/Analyser/Static/Acorn/Disk.cpp b/Analyser/Static/Acorn/Disk.cpp index 9447005b3..bd29c8d49 100644 --- a/Analyser/Static/Acorn/Disk.cpp +++ b/Analyser/Static/Acorn/Disk.cpp @@ -8,9 +8,9 @@ #include "Disk.hpp" -#include "../../../Storage/Disk/Controller/DiskController.hpp" -#include "../../../Storage/Disk/Encodings/MFM/Parser.hpp" -#include "../../../Numeric/CRC.hpp" +#include "Storage/Disk/Controller/DiskController.hpp" +#include "Storage/Disk/Encodings/MFM/Parser.hpp" +#include "Numeric/CRC.hpp" #include #include diff --git a/Analyser/Static/Acorn/Disk.hpp b/Analyser/Static/Acorn/Disk.hpp index 4ec65a486..8754a49ed 100644 --- a/Analyser/Static/Acorn/Disk.hpp +++ b/Analyser/Static/Acorn/Disk.hpp @@ -9,7 +9,7 @@ #pragma once #include "File.hpp" -#include "../../../Storage/Disk/Disk.hpp" +#include "Storage/Disk/Disk.hpp" namespace Analyser::Static::Acorn { diff --git a/Analyser/Static/Acorn/StaticAnalyser.cpp b/Analyser/Static/Acorn/StaticAnalyser.cpp index eb8f6d4f8..86a573a31 100644 --- a/Analyser/Static/Acorn/StaticAnalyser.cpp +++ b/Analyser/Static/Acorn/StaticAnalyser.cpp @@ -12,7 +12,7 @@ #include "Tape.hpp" #include "Target.hpp" -#include "../../../Numeric/StringSimilarity.hpp" +#include "Numeric/StringSimilarity.hpp" #include #include diff --git a/Analyser/Static/Acorn/StaticAnalyser.hpp b/Analyser/Static/Acorn/StaticAnalyser.hpp index ac7d396e3..ccc6de5d6 100644 --- a/Analyser/Static/Acorn/StaticAnalyser.hpp +++ b/Analyser/Static/Acorn/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::Acorn { diff --git a/Analyser/Static/Acorn/Tape.cpp b/Analyser/Static/Acorn/Tape.cpp index 43253b28c..997dcd2ee 100644 --- a/Analyser/Static/Acorn/Tape.cpp +++ b/Analyser/Static/Acorn/Tape.cpp @@ -10,8 +10,8 @@ #include -#include "../../../Numeric/CRC.hpp" -#include "../../../Storage/Tape/Parsers/Acorn.hpp" +#include "Numeric/CRC.hpp" +#include "Storage/Tape/Parsers/Acorn.hpp" using namespace Analyser::Static::Acorn; diff --git a/Analyser/Static/Acorn/Tape.hpp b/Analyser/Static/Acorn/Tape.hpp index d8741f05a..6be2e1794 100644 --- a/Analyser/Static/Acorn/Tape.hpp +++ b/Analyser/Static/Acorn/Tape.hpp @@ -8,10 +8,10 @@ #pragma once -#include - #include "File.hpp" -#include "../../../Storage/Tape/Tape.hpp" +#include "Storage/Tape/Tape.hpp" + +#include namespace Analyser::Static::Acorn { diff --git a/Analyser/Static/Acorn/Target.hpp b/Analyser/Static/Acorn/Target.hpp index d99a2dfcb..257823e83 100644 --- a/Analyser/Static/Acorn/Target.hpp +++ b/Analyser/Static/Acorn/Target.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Reflection/Struct.hpp" -#include "../StaticAnalyser.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Reflection/Struct.hpp" #include namespace Analyser::Static::Acorn { diff --git a/Analyser/Static/Amiga/StaticAnalyser.hpp b/Analyser/Static/Amiga/StaticAnalyser.hpp index f7395a609..4dc7472fd 100644 --- a/Analyser/Static/Amiga/StaticAnalyser.hpp +++ b/Analyser/Static/Amiga/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::Amiga { diff --git a/Analyser/Static/Amiga/Target.hpp b/Analyser/Static/Amiga/Target.hpp index 15156235c..0a7077cc1 100644 --- a/Analyser/Static/Amiga/Target.hpp +++ b/Analyser/Static/Amiga/Target.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Reflection/Struct.hpp" -#include "../StaticAnalyser.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Reflection/Struct.hpp" namespace Analyser::Static::Amiga { diff --git a/Analyser/Static/AmstradCPC/StaticAnalyser.cpp b/Analyser/Static/AmstradCPC/StaticAnalyser.cpp index f7613cb2e..27c0f03ee 100644 --- a/Analyser/Static/AmstradCPC/StaticAnalyser.cpp +++ b/Analyser/Static/AmstradCPC/StaticAnalyser.cpp @@ -8,15 +8,15 @@ #include "StaticAnalyser.hpp" -#include -#include - -#include "../../../Storage/Disk/Parsers/CPM.hpp" -#include "../../../Storage/Disk/Encodings/MFM/Parser.hpp" -#include "../../../Storage/Tape/Parsers/Spectrum.hpp" +#include "Storage/Disk/Parsers/CPM.hpp" +#include "Storage/Disk/Encodings/MFM/Parser.hpp" +#include "Storage/Tape/Parsers/Spectrum.hpp" #include "Target.hpp" +#include +#include + namespace { bool strcmp_insensitive(const char *a, const char *b) { diff --git a/Analyser/Static/AmstradCPC/StaticAnalyser.hpp b/Analyser/Static/AmstradCPC/StaticAnalyser.hpp index b2544369c..b9c915503 100644 --- a/Analyser/Static/AmstradCPC/StaticAnalyser.hpp +++ b/Analyser/Static/AmstradCPC/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::AmstradCPC { diff --git a/Analyser/Static/AmstradCPC/Target.hpp b/Analyser/Static/AmstradCPC/Target.hpp index a2e1c91ba..cf27067d2 100644 --- a/Analyser/Static/AmstradCPC/Target.hpp +++ b/Analyser/Static/AmstradCPC/Target.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../../Reflection/Enum.hpp" -#include "../../../Reflection/Struct.hpp" -#include "../StaticAnalyser.hpp" +#include "Reflection/Enum.hpp" +#include "Reflection/Struct.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" #include namespace Analyser::Static::AmstradCPC { diff --git a/Analyser/Static/AppleII/StaticAnalyser.hpp b/Analyser/Static/AppleII/StaticAnalyser.hpp index 48617c138..0589b6067 100644 --- a/Analyser/Static/AppleII/StaticAnalyser.hpp +++ b/Analyser/Static/AppleII/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::AppleII { diff --git a/Analyser/Static/AppleII/Target.hpp b/Analyser/Static/AppleII/Target.hpp index 5b459b8d4..340154162 100644 --- a/Analyser/Static/AppleII/Target.hpp +++ b/Analyser/Static/AppleII/Target.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../../Reflection/Enum.hpp" -#include "../../../Reflection/Struct.hpp" -#include "../StaticAnalyser.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Reflection/Enum.hpp" +#include "Reflection/Struct.hpp" namespace Analyser::Static::AppleII { diff --git a/Analyser/Static/AppleIIgs/StaticAnalyser.hpp b/Analyser/Static/AppleIIgs/StaticAnalyser.hpp index 4f795a03e..e8c9d7f59 100644 --- a/Analyser/Static/AppleIIgs/StaticAnalyser.hpp +++ b/Analyser/Static/AppleIIgs/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::AppleIIgs { diff --git a/Analyser/Static/AppleIIgs/Target.hpp b/Analyser/Static/AppleIIgs/Target.hpp index cf81eeae2..2f79f8556 100644 --- a/Analyser/Static/AppleIIgs/Target.hpp +++ b/Analyser/Static/AppleIIgs/Target.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../../Reflection/Enum.hpp" -#include "../../../Reflection/Struct.hpp" -#include "../StaticAnalyser.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Reflection/Enum.hpp" +#include "Reflection/Struct.hpp" namespace Analyser::Static::AppleIIgs { diff --git a/Analyser/Static/Atari2600/StaticAnalyser.cpp b/Analyser/Static/Atari2600/StaticAnalyser.cpp index 3035dc09f..9a1c29632 100644 --- a/Analyser/Static/Atari2600/StaticAnalyser.cpp +++ b/Analyser/Static/Atari2600/StaticAnalyser.cpp @@ -10,7 +10,7 @@ #include "Target.hpp" -#include "../Disassembler/6502.hpp" +#include "Analyser/Static/Disassembler/6502.hpp" using namespace Analyser::Static::Atari2600; using Target = Analyser::Static::Atari2600::Target; diff --git a/Analyser/Static/Atari2600/StaticAnalyser.hpp b/Analyser/Static/Atari2600/StaticAnalyser.hpp index 3bf03c9fa..05f88aa45 100644 --- a/Analyser/Static/Atari2600/StaticAnalyser.hpp +++ b/Analyser/Static/Atari2600/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::Atari2600 { diff --git a/Analyser/Static/Atari2600/Target.hpp b/Analyser/Static/Atari2600/Target.hpp index 09bcd9843..27a548b5b 100644 --- a/Analyser/Static/Atari2600/Target.hpp +++ b/Analyser/Static/Atari2600/Target.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../StaticAnalyser.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" namespace Analyser::Static::Atari2600 { diff --git a/Analyser/Static/AtariST/StaticAnalyser.hpp b/Analyser/Static/AtariST/StaticAnalyser.hpp index 483aa1a72..7f6e2e400 100644 --- a/Analyser/Static/AtariST/StaticAnalyser.hpp +++ b/Analyser/Static/AtariST/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::AtariST { diff --git a/Analyser/Static/AtariST/Target.hpp b/Analyser/Static/AtariST/Target.hpp index 01599a254..224adc950 100644 --- a/Analyser/Static/AtariST/Target.hpp +++ b/Analyser/Static/AtariST/Target.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Reflection/Struct.hpp" -#include "../StaticAnalyser.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Reflection/Struct.hpp" namespace Analyser::Static::AtariST { diff --git a/Analyser/Static/Coleco/StaticAnalyser.hpp b/Analyser/Static/Coleco/StaticAnalyser.hpp index 343053bee..ce4dc9035 100644 --- a/Analyser/Static/Coleco/StaticAnalyser.hpp +++ b/Analyser/Static/Coleco/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::Coleco { diff --git a/Analyser/Static/Commodore/Disk.cpp b/Analyser/Static/Commodore/Disk.cpp index 2d0f0381b..4867bce76 100644 --- a/Analyser/Static/Commodore/Disk.cpp +++ b/Analyser/Static/Commodore/Disk.cpp @@ -7,14 +7,14 @@ // #include "Disk.hpp" -#include "../../../Storage/Disk/Controller/DiskController.hpp" -#include "../../../Storage/Disk/Encodings/CommodoreGCR.hpp" -#include "../../../Storage/Data/Commodore.hpp" +#include "Storage/Disk/Controller/DiskController.hpp" +#include "Storage/Disk/Encodings/CommodoreGCR.hpp" +#include "Storage/Data/Commodore.hpp" -#include -#include #include +#include #include +#include using namespace Analyser::Static::Commodore; diff --git a/Analyser/Static/Commodore/Disk.hpp b/Analyser/Static/Commodore/Disk.hpp index ae9bc4187..6920cf43e 100644 --- a/Analyser/Static/Commodore/Disk.hpp +++ b/Analyser/Static/Commodore/Disk.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../../../Storage/Disk/Disk.hpp" +#include "Storage/Disk/Disk.hpp" #include "File.hpp" #include diff --git a/Analyser/Static/Commodore/StaticAnalyser.cpp b/Analyser/Static/Commodore/StaticAnalyser.cpp index 6e38608ae..dea9137ea 100644 --- a/Analyser/Static/Commodore/StaticAnalyser.cpp +++ b/Analyser/Static/Commodore/StaticAnalyser.cpp @@ -12,11 +12,11 @@ #include "File.hpp" #include "Tape.hpp" #include "Target.hpp" -#include "../../../Storage/Cartridge/Encodings/CommodoreROM.hpp" -#include "../../../Outputs/Log.hpp" +#include "Storage/Cartridge/Encodings/CommodoreROM.hpp" +#include "Outputs/Log.hpp" -#include "../Disassembler/6502.hpp" -#include "../Disassembler/AddressMapper.hpp" +#include "Analyser/Static/Disassembler/6502.hpp" +#include "Analyser/Static/Disassembler/AddressMapper.hpp" #include #include diff --git a/Analyser/Static/Commodore/StaticAnalyser.hpp b/Analyser/Static/Commodore/StaticAnalyser.hpp index 7da348c16..adcacc054 100644 --- a/Analyser/Static/Commodore/StaticAnalyser.hpp +++ b/Analyser/Static/Commodore/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::Commodore { diff --git a/Analyser/Static/Commodore/Tape.cpp b/Analyser/Static/Commodore/Tape.cpp index 888a23105..2c6aef31f 100644 --- a/Analyser/Static/Commodore/Tape.cpp +++ b/Analyser/Static/Commodore/Tape.cpp @@ -7,8 +7,7 @@ // #include "Tape.hpp" - -#include "../../../Storage/Tape/Parsers/Commodore.hpp" +#include "Storage/Tape/Parsers/Commodore.hpp" using namespace Analyser::Static::Commodore; diff --git a/Analyser/Static/Commodore/Tape.hpp b/Analyser/Static/Commodore/Tape.hpp index 4f3613514..da4949106 100644 --- a/Analyser/Static/Commodore/Tape.hpp +++ b/Analyser/Static/Commodore/Tape.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Storage/Tape/Tape.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Storage/Tape/Tape.hpp" +#include "Storage/TargetPlatforms.hpp" #include "File.hpp" namespace Analyser::Static::Commodore { diff --git a/Analyser/Static/Commodore/Target.hpp b/Analyser/Static/Commodore/Target.hpp index ae13b6d88..490f4f582 100644 --- a/Analyser/Static/Commodore/Target.hpp +++ b/Analyser/Static/Commodore/Target.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../../Reflection/Enum.hpp" -#include "../../../Reflection/Struct.hpp" -#include "../StaticAnalyser.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Reflection/Enum.hpp" +#include "Reflection/Struct.hpp" #include namespace Analyser::Static::Commodore { diff --git a/Analyser/Static/DiskII/StaticAnalyser.cpp b/Analyser/Static/DiskII/StaticAnalyser.cpp index c27d562a4..857e5d6ec 100644 --- a/Analyser/Static/DiskII/StaticAnalyser.cpp +++ b/Analyser/Static/DiskII/StaticAnalyser.cpp @@ -8,14 +8,14 @@ #include "StaticAnalyser.hpp" -#include "../AppleII/Target.hpp" -#include "../AppleIIgs/Target.hpp" -#include "../Oric/Target.hpp" -#include "../Disassembler/6502.hpp" -#include "../Disassembler/AddressMapper.hpp" +#include "Analyser/Static/AppleII/Target.hpp" +#include "Analyser/Static//AppleIIgs/Target.hpp" +#include "Analyser/Static//Oric/Target.hpp" +#include "Analyser/Static//Disassembler/6502.hpp" +#include "Analyser/Static//Disassembler/AddressMapper.hpp" -#include "../../../Storage/Disk/Track/TrackSerialiser.hpp" -#include "../../../Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp" +#include "Storage/Disk/Track/TrackSerialiser.hpp" +#include "Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp" namespace { diff --git a/Analyser/Static/DiskII/StaticAnalyser.hpp b/Analyser/Static/DiskII/StaticAnalyser.hpp index 005a08c4d..f7b4583bf 100644 --- a/Analyser/Static/DiskII/StaticAnalyser.hpp +++ b/Analyser/Static/DiskII/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::DiskII { diff --git a/Analyser/Static/Enterprise/StaticAnalyser.cpp b/Analyser/Static/Enterprise/StaticAnalyser.cpp index 860559580..6223d119f 100644 --- a/Analyser/Static/Enterprise/StaticAnalyser.cpp +++ b/Analyser/Static/Enterprise/StaticAnalyser.cpp @@ -9,7 +9,7 @@ #include "StaticAnalyser.hpp" #include "Target.hpp" -#include "../../../Storage/Disk/Parsers/FAT.hpp" +#include "Storage/Disk/Parsers/FAT.hpp" #include diff --git a/Analyser/Static/Enterprise/StaticAnalyser.hpp b/Analyser/Static/Enterprise/StaticAnalyser.hpp index 9190dfe61..ab0d05b4e 100644 --- a/Analyser/Static/Enterprise/StaticAnalyser.hpp +++ b/Analyser/Static/Enterprise/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::Enterprise { diff --git a/Analyser/Static/Enterprise/Target.hpp b/Analyser/Static/Enterprise/Target.hpp index dba0d4614..acd780a4a 100644 --- a/Analyser/Static/Enterprise/Target.hpp +++ b/Analyser/Static/Enterprise/Target.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../../Reflection/Enum.hpp" -#include "../../../Reflection/Struct.hpp" -#include "../StaticAnalyser.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Reflection/Enum.hpp" +#include "Reflection/Struct.hpp" #include diff --git a/Analyser/Static/FAT12/StaticAnalyser.hpp b/Analyser/Static/FAT12/StaticAnalyser.hpp index f1da085b1..2764c6bbb 100644 --- a/Analyser/Static/FAT12/StaticAnalyser.hpp +++ b/Analyser/Static/FAT12/StaticAnalyser.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../StaticAnalyser.hpp" -#include "../../../Storage/TargetPlatforms.hpp" +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Storage/TargetPlatforms.hpp" #include namespace Analyser::Static::FAT12 { diff --git a/Analyser/Static/StaticAnalyser.cpp b/Analyser/Static/StaticAnalyser.cpp index 2aba4c401..0930e2c27 100644 --- a/Analyser/Static/StaticAnalyser.cpp +++ b/Analyser/Static/StaticAnalyser.cpp @@ -15,76 +15,76 @@ #include // Analysers -#include "Acorn/StaticAnalyser.hpp" -#include "Amiga/StaticAnalyser.hpp" -#include "AmstradCPC/StaticAnalyser.hpp" -#include "AppleII/StaticAnalyser.hpp" -#include "AppleIIgs/StaticAnalyser.hpp" -#include "Atari2600/StaticAnalyser.hpp" -#include "AtariST/StaticAnalyser.hpp" -#include "Coleco/StaticAnalyser.hpp" -#include "Commodore/StaticAnalyser.hpp" -#include "DiskII/StaticAnalyser.hpp" -#include "Enterprise/StaticAnalyser.hpp" -#include "FAT12/StaticAnalyser.hpp" -#include "Macintosh/StaticAnalyser.hpp" -#include "MSX/StaticAnalyser.hpp" -#include "Oric/StaticAnalyser.hpp" -#include "PCCompatible/StaticAnalyser.hpp" -#include "Sega/StaticAnalyser.hpp" -#include "ZX8081/StaticAnalyser.hpp" -#include "ZXSpectrum/StaticAnalyser.hpp" +#include "Analyser/Static/Acorn/StaticAnalyser.hpp" +#include "Analyser/Static/Amiga/StaticAnalyser.hpp" +#include "Analyser/Static/AmstradCPC/StaticAnalyser.hpp" +#include "Analyser/Static/AppleII/StaticAnalyser.hpp" +#include "Analyser/Static/AppleIIgs/StaticAnalyser.hpp" +#include "Analyser/Static/Atari2600/StaticAnalyser.hpp" +#include "Analyser/Static/AtariST/StaticAnalyser.hpp" +#include "Analyser/Static/Coleco/StaticAnalyser.hpp" +#include "Analyser/Static/Commodore/StaticAnalyser.hpp" +#include "Analyser/Static/DiskII/StaticAnalyser.hpp" +#include "Analyser/Static/Enterprise/StaticAnalyser.hpp" +#include "Analyser/Static/FAT12/StaticAnalyser.hpp" +#include "Analyser/Static/Macintosh/StaticAnalyser.hpp" +#include "Analyser/Static/MSX/StaticAnalyser.hpp" +#include "Analyser/Static/Oric/StaticAnalyser.hpp" +#include "Analyser/Static/PCCompatible/StaticAnalyser.hpp" +#include "Analyser/Static/Sega/StaticAnalyser.hpp" +#include "Analyser/Static/ZX8081/StaticAnalyser.hpp" +#include "Analyser/Static/ZXSpectrum/StaticAnalyser.hpp" // Cartridges -#include "../../Storage/Cartridge/Formats/BinaryDump.hpp" -#include "../../Storage/Cartridge/Formats/PRG.hpp" +#include "Storage/Cartridge/Formats/BinaryDump.hpp" +#include "Storage/Cartridge/Formats/PRG.hpp" // Disks -#include "../../Storage/Disk/DiskImage/Formats/2MG.hpp" -#include "../../Storage/Disk/DiskImage/Formats/AcornADF.hpp" -#include "../../Storage/Disk/DiskImage/Formats/AmigaADF.hpp" -#include "../../Storage/Disk/DiskImage/Formats/AppleDSK.hpp" -#include "../../Storage/Disk/DiskImage/Formats/CPCDSK.hpp" -#include "../../Storage/Disk/DiskImage/Formats/D64.hpp" -#include "../../Storage/Disk/DiskImage/Formats/G64.hpp" -#include "../../Storage/Disk/DiskImage/Formats/DMK.hpp" -#include "../../Storage/Disk/DiskImage/Formats/FAT12.hpp" -#include "../../Storage/Disk/DiskImage/Formats/HFE.hpp" -#include "../../Storage/Disk/DiskImage/Formats/IPF.hpp" -#include "../../Storage/Disk/DiskImage/Formats/IMD.hpp" -#include "../../Storage/Disk/DiskImage/Formats/MacintoshIMG.hpp" -#include "../../Storage/Disk/DiskImage/Formats/MSA.hpp" -#include "../../Storage/Disk/DiskImage/Formats/NIB.hpp" -#include "../../Storage/Disk/DiskImage/Formats/OricMFMDSK.hpp" -#include "../../Storage/Disk/DiskImage/Formats/PCBooter.hpp" -#include "../../Storage/Disk/DiskImage/Formats/SSD.hpp" -#include "../../Storage/Disk/DiskImage/Formats/STX.hpp" -#include "../../Storage/Disk/DiskImage/Formats/WOZ.hpp" +#include "Storage/Disk/DiskImage/Formats/2MG.hpp" +#include "Storage/Disk/DiskImage/Formats/AcornADF.hpp" +#include "Storage/Disk/DiskImage/Formats/AmigaADF.hpp" +#include "Storage/Disk/DiskImage/Formats/AppleDSK.hpp" +#include "Storage/Disk/DiskImage/Formats/CPCDSK.hpp" +#include "Storage/Disk/DiskImage/Formats/D64.hpp" +#include "Storage/Disk/DiskImage/Formats/G64.hpp" +#include "Storage/Disk/DiskImage/Formats/DMK.hpp" +#include "Storage/Disk/DiskImage/Formats/FAT12.hpp" +#include "Storage/Disk/DiskImage/Formats/HFE.hpp" +#include "Storage/Disk/DiskImage/Formats/IPF.hpp" +#include "Storage/Disk/DiskImage/Formats/IMD.hpp" +#include "Storage/Disk/DiskImage/Formats/MacintoshIMG.hpp" +#include "Storage/Disk/DiskImage/Formats/MSA.hpp" +#include "Storage/Disk/DiskImage/Formats/NIB.hpp" +#include "Storage/Disk/DiskImage/Formats/OricMFMDSK.hpp" +#include "Storage/Disk/DiskImage/Formats/PCBooter.hpp" +#include "Storage/Disk/DiskImage/Formats/SSD.hpp" +#include "Storage/Disk/DiskImage/Formats/STX.hpp" +#include "Storage/Disk/DiskImage/Formats/WOZ.hpp" // Mass Storage Devices (i.e. usually, hard disks) -#include "../../Storage/MassStorage/Formats/DAT.hpp" -#include "../../Storage/MassStorage/Formats/DSK.hpp" -#include "../../Storage/MassStorage/Formats/HDV.hpp" -#include "../../Storage/MassStorage/Formats/HFV.hpp" +#include "Storage/MassStorage/Formats/DAT.hpp" +#include "Storage/MassStorage/Formats/DSK.hpp" +#include "Storage/MassStorage/Formats/HDV.hpp" +#include "Storage/MassStorage/Formats/HFV.hpp" // State Snapshots -#include "../../Storage/State/SNA.hpp" -#include "../../Storage/State/SZX.hpp" -#include "../../Storage/State/Z80.hpp" +#include "Storage/State/SNA.hpp" +#include "Storage/State/SZX.hpp" +#include "Storage/State/Z80.hpp" // Tapes -#include "../../Storage/Tape/Formats/CAS.hpp" -#include "../../Storage/Tape/Formats/CommodoreTAP.hpp" -#include "../../Storage/Tape/Formats/CSW.hpp" -#include "../../Storage/Tape/Formats/OricTAP.hpp" -#include "../../Storage/Tape/Formats/TapePRG.hpp" -#include "../../Storage/Tape/Formats/TapeUEF.hpp" -#include "../../Storage/Tape/Formats/TZX.hpp" -#include "../../Storage/Tape/Formats/ZX80O81P.hpp" -#include "../../Storage/Tape/Formats/ZXSpectrumTAP.hpp" +#include "Storage/Tape/Formats/CAS.hpp" +#include "Storage/Tape/Formats/CommodoreTAP.hpp" +#include "Storage/Tape/Formats/CSW.hpp" +#include "Storage/Tape/Formats/OricTAP.hpp" +#include "Storage/Tape/Formats/TapePRG.hpp" +#include "Storage/Tape/Formats/TapeUEF.hpp" +#include "Storage/Tape/Formats/TZX.hpp" +#include "Storage/Tape/Formats/ZX80O81P.hpp" +#include "Storage/Tape/Formats/ZXSpectrumTAP.hpp" // Target Platform Types -#include "../../Storage/TargetPlatforms.hpp" +#include "Storage/TargetPlatforms.hpp" template inline constexpr bool always_false_v = false; diff --git a/Analyser/Static/StaticAnalyser.hpp b/Analyser/Static/StaticAnalyser.hpp index 9514cc2af..640c298f1 100644 --- a/Analyser/Static/StaticAnalyser.hpp +++ b/Analyser/Static/StaticAnalyser.hpp @@ -8,14 +8,14 @@ #pragma once -#include "../Machines.hpp" +#include "Analyser/Machines.hpp" -#include "../../Storage/Cartridge/Cartridge.hpp" -#include "../../Storage/Disk/Disk.hpp" -#include "../../Storage/MassStorage/MassStorageDevice.hpp" -#include "../../Storage/Tape/Tape.hpp" -#include "../../Storage/TargetPlatforms.hpp" -#include "../../Reflection/Struct.hpp" +#include "Storage/Cartridge/Cartridge.hpp" +#include "Storage/Disk/Disk.hpp" +#include "Storage/MassStorage/MassStorageDevice.hpp" +#include "Storage/Tape/Tape.hpp" +#include "Storage/TargetPlatforms.hpp" +#include "Reflection/Struct.hpp" #include #include diff --git a/ClockReceiver/ScanSynchroniser.hpp b/ClockReceiver/ScanSynchroniser.hpp index 031207762..5b33da00d 100644 --- a/ClockReceiver/ScanSynchroniser.hpp +++ b/ClockReceiver/ScanSynchroniser.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Outputs/ScanTarget.hpp" +#include "Outputs/ScanTarget.hpp" #include diff --git a/Components/1770/1770.cpp b/Components/1770/1770.cpp index 56b50b027..72431f799 100644 --- a/Components/1770/1770.cpp +++ b/Components/1770/1770.cpp @@ -8,8 +8,8 @@ #include "1770.hpp" -#include "../../Storage/Disk/Encodings/MFM/Constants.hpp" -#include "../../Outputs/Log.hpp" +#include "Storage/Disk/Encodings/MFM/Constants.hpp" +#include "Outputs/Log.hpp" namespace { Log::Logger logger; diff --git a/Components/5380/ncr5380.cpp b/Components/5380/ncr5380.cpp index d58068c62..4928b801b 100644 --- a/Components/5380/ncr5380.cpp +++ b/Components/5380/ncr5380.cpp @@ -8,7 +8,7 @@ #include "ncr5380.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" namespace { Log::Logger logger; diff --git a/Components/6522/Implementation/6522Implementation.hpp b/Components/6522/Implementation/6522Implementation.hpp index ccca7a2dd..a4217ed4b 100644 --- a/Components/6522/Implementation/6522Implementation.hpp +++ b/Components/6522/Implementation/6522Implementation.hpp @@ -6,7 +6,7 @@ // Copyright 2017 Thomas Harte. All rights reserved. // -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" // As-yet unimplemented (incomplete list): // diff --git a/Components/6526/Implementation/6526Storage.hpp b/Components/6526/Implementation/6526Storage.hpp index 0d7c8b5be..bdeee7d35 100644 --- a/Components/6526/Implementation/6526Storage.hpp +++ b/Components/6526/Implementation/6526Storage.hpp @@ -10,8 +10,8 @@ #include -#include "../../../ClockReceiver/ClockReceiver.hpp" -#include "../../../Outputs/Log.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "Outputs/Log.hpp" namespace MOS::MOS6526 { diff --git a/Components/6560/6560.hpp b/Components/6560/6560.hpp index 61f4350e6..d337e87eb 100644 --- a/Components/6560/6560.hpp +++ b/Components/6560/6560.hpp @@ -8,11 +8,11 @@ #pragma once -#include "../../ClockReceiver/ClockReceiver.hpp" -#include "../../Concurrency/AsyncTaskQueue.hpp" -#include "../../Outputs/CRT/CRT.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Outputs/Speaker/Implementation/BufferSource.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" namespace MOS::MOS6560 { diff --git a/Components/68901/MFP68901.cpp b/Components/68901/MFP68901.cpp index 345890424..416cf1dd1 100644 --- a/Components/68901/MFP68901.cpp +++ b/Components/68901/MFP68901.cpp @@ -11,7 +11,7 @@ #include #include -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" namespace { diff --git a/Components/8272/i8272.cpp b/Components/8272/i8272.cpp index dd016a71d..d6e9d1d5a 100644 --- a/Components/8272/i8272.cpp +++ b/Components/8272/i8272.cpp @@ -8,7 +8,7 @@ #include "i8272.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" namespace { diff --git a/Components/8530/z8530.cpp b/Components/8530/z8530.cpp index 117e1999f..a5d376533 100644 --- a/Components/8530/z8530.cpp +++ b/Components/8530/z8530.cpp @@ -8,7 +8,7 @@ #include "z8530.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" using namespace Zilog::SCC; diff --git a/Components/9918/9918.hpp b/Components/9918/9918.hpp index e74e12d3d..7770016d4 100644 --- a/Components/9918/9918.hpp +++ b/Components/9918/9918.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../Outputs/CRT/CRT.hpp" -#include "../../ClockReceiver/ClockReceiver.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" #include diff --git a/Components/9918/Implementation/9918.cpp b/Components/9918/Implementation/9918.cpp index c62190655..ebce12c12 100644 --- a/Components/9918/Implementation/9918.cpp +++ b/Components/9918/Implementation/9918.cpp @@ -6,12 +6,13 @@ // Copyright 2017 Thomas Harte. All rights reserved. // -#include "../9918.hpp" +#include "Components/9918/9918.hpp" + +#include "Outputs/Log.hpp" #include #include #include -#include "../../../Outputs/Log.hpp" using namespace TI::TMS; diff --git a/Components/9918/Implementation/9918Base.hpp b/Components/9918/Implementation/9918Base.hpp index 24fa31e11..6c205470d 100644 --- a/Components/9918/Implementation/9918Base.hpp +++ b/Components/9918/Implementation/9918Base.hpp @@ -10,9 +10,9 @@ #include "ClockConverter.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" -#include "../../../Numeric/BitReverse.hpp" -#include "../../../Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "Numeric/BitReverse.hpp" +#include "Outputs/CRT/CRT.hpp" #include "AccessEnums.hpp" #include "LineBuffer.hpp" diff --git a/Components/AY38910/AY38910.hpp b/Components/AY38910/AY38910.hpp index 216ae45b5..271c8fbdb 100644 --- a/Components/AY38910/AY38910.hpp +++ b/Components/AY38910/AY38910.hpp @@ -8,10 +8,10 @@ #pragma once -#include "../../Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" -#include "../../Reflection/Struct.hpp" +#include "Reflection/Struct.hpp" namespace GI::AY38910 { diff --git a/Components/AudioToggle/AudioToggle.hpp b/Components/AudioToggle/AudioToggle.hpp index 4146c66de..06b6e168c 100644 --- a/Components/AudioToggle/AudioToggle.hpp +++ b/Components/AudioToggle/AudioToggle.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" namespace Audio { diff --git a/Components/DiskII/IWM.cpp b/Components/DiskII/IWM.cpp index 5ccb71f29..c066acd8d 100644 --- a/Components/DiskII/IWM.cpp +++ b/Components/DiskII/IWM.cpp @@ -8,7 +8,7 @@ #include "IWM.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" using namespace Apple; diff --git a/Components/I2C/I2C.cpp b/Components/I2C/I2C.cpp index 9066a9b6f..8487eaa93 100644 --- a/Components/I2C/I2C.cpp +++ b/Components/I2C/I2C.cpp @@ -8,7 +8,7 @@ #include "I2C.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" using namespace I2C; diff --git a/Components/KonamiSCC/KonamiSCC.hpp b/Components/KonamiSCC/KonamiSCC.hpp index 9c6607189..44b1c1907 100644 --- a/Components/KonamiSCC/KonamiSCC.hpp +++ b/Components/KonamiSCC/KonamiSCC.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" namespace Konami { diff --git a/Components/OPx/Implementation/OPLBase.hpp b/Components/OPx/Implementation/OPLBase.hpp index 990c0783e..37057c519 100644 --- a/Components/OPx/Implementation/OPLBase.hpp +++ b/Components/OPx/Implementation/OPLBase.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../../Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" namespace Yamaha::OPL { diff --git a/Components/SN76489/SN76489.hpp b/Components/SN76489/SN76489.hpp index 926ed8de4..8dfad56e2 100644 --- a/Components/SN76489/SN76489.hpp +++ b/Components/SN76489/SN76489.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" namespace TI { diff --git a/InstructionSets/M50740/Executor.cpp b/InstructionSets/M50740/Executor.cpp index 85e3ccfdb..06dfb09b0 100644 --- a/InstructionSets/M50740/Executor.cpp +++ b/InstructionSets/M50740/Executor.cpp @@ -8,8 +8,8 @@ #include "Executor.hpp" -#include "../../Machines/Utility/MemoryFuzzer.hpp" -#include "../../Outputs/Log.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" +#include "Outputs/Log.hpp" #include #include diff --git a/Machines/Acorn/Archimedes/Archimedes.cpp b/Machines/Acorn/Archimedes/Archimedes.cpp index 1828f67f2..685957859 100644 --- a/Machines/Acorn/Archimedes/Archimedes.cpp +++ b/Machines/Acorn/Archimedes/Archimedes.cpp @@ -15,23 +15,23 @@ #include "MemoryController.hpp" #include "Sound.hpp" -#include "../../../Configurable/Configurable.hpp" +#include "Configurable/Configurable.hpp" -#include "../../AudioProducer.hpp" -#include "../../KeyboardMachine.hpp" -#include "../../MediaTarget.hpp" -#include "../../MouseMachine.hpp" -#include "../../ScanProducer.hpp" -#include "../../TimedMachine.hpp" +#include "Machines/AudioProducer.hpp" +#include "Machines/KeyboardMachine.hpp" +#include "Machines/MediaTarget.hpp" +#include "Machines/MouseMachine.hpp" +#include "Machines/ScanProducer.hpp" +#include "Machines/TimedMachine.hpp" -#include "../../../Activity/Source.hpp" +#include "Activity/Source.hpp" -#include "../../../InstructionSets/ARM/Disassembler.hpp" -#include "../../../InstructionSets/ARM/Executor.hpp" -#include "../../../Outputs/Log.hpp" -#include "../../../Components/I2C/I2C.hpp" +#include "InstructionSets/ARM/Disassembler.hpp" +#include "InstructionSets/ARM/Executor.hpp" +#include "Outputs/Log.hpp" +#include "Components/I2C/I2C.hpp" -#include "../../../Analyser/Static/Acorn/Target.hpp" +#include "Analyser/Static/Acorn/Target.hpp" #include #include diff --git a/Machines/Acorn/Archimedes/CMOSRAM.hpp b/Machines/Acorn/Archimedes/CMOSRAM.hpp index f97ef80bb..c35164be8 100644 --- a/Machines/Acorn/Archimedes/CMOSRAM.hpp +++ b/Machines/Acorn/Archimedes/CMOSRAM.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Components/I2C/I2C.hpp" -#include "../../../Outputs/Log.hpp" +#include "Components/I2C/I2C.hpp" +#include "Outputs/Log.hpp" #include diff --git a/Machines/Acorn/Archimedes/InputOutputController.hpp b/Machines/Acorn/Archimedes/InputOutputController.hpp index 4480aafad..c5f3b296a 100644 --- a/Machines/Acorn/Archimedes/InputOutputController.hpp +++ b/Machines/Acorn/Archimedes/InputOutputController.hpp @@ -14,9 +14,9 @@ #include "Sound.hpp" #include "Video.hpp" -#include "../../../Outputs/Log.hpp" -#include "../../../Activity/Observer.hpp" -#include "../../../ClockReceiver/ClockingHintSource.hpp" +#include "Outputs/Log.hpp" +#include "Activity/Observer.hpp" +#include "ClockReceiver/ClockingHintSource.hpp" namespace Archimedes { diff --git a/Machines/Acorn/Archimedes/Keyboard.hpp b/Machines/Acorn/Archimedes/Keyboard.hpp index 81a356117..a40f00587 100644 --- a/Machines/Acorn/Archimedes/Keyboard.hpp +++ b/Machines/Acorn/Archimedes/Keyboard.hpp @@ -10,8 +10,8 @@ #include "HalfDuplexSerial.hpp" -#include "../../../Outputs/Log.hpp" -#include "../../../Inputs/Mouse.hpp" +#include "Outputs/Log.hpp" +#include "Inputs/Mouse.hpp" #include diff --git a/Machines/Acorn/Archimedes/MemoryController.hpp b/Machines/Acorn/Archimedes/MemoryController.hpp index 06d6a796e..9fb27bb9f 100644 --- a/Machines/Acorn/Archimedes/MemoryController.hpp +++ b/Machines/Acorn/Archimedes/MemoryController.hpp @@ -12,9 +12,9 @@ #include "Video.hpp" #include "Sound.hpp" -#include "../../../InstructionSets/ARM/Registers.hpp" -#include "../../../Outputs/Log.hpp" -#include "../../../Activity/Observer.hpp" +#include "InstructionSets/ARM/Registers.hpp" +#include "Outputs/Log.hpp" +#include "Activity/Observer.hpp" namespace Archimedes { diff --git a/Machines/Acorn/Archimedes/Sound.hpp b/Machines/Acorn/Archimedes/Sound.hpp index 77a28845c..859a264dc 100644 --- a/Machines/Acorn/Archimedes/Sound.hpp +++ b/Machines/Acorn/Archimedes/Sound.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Concurrency/AsyncTaskQueue.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" #include #include diff --git a/Machines/Acorn/Archimedes/Video.hpp b/Machines/Acorn/Archimedes/Video.hpp index ee6a372a4..c0abffbd7 100644 --- a/Machines/Acorn/Archimedes/Video.hpp +++ b/Machines/Acorn/Archimedes/Video.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Outputs/Log.hpp" -#include "../../../Outputs/CRT/CRT.hpp" +#include "Outputs/Log.hpp" +#include "Outputs/CRT/CRT.hpp" #include #include diff --git a/Machines/Acorn/Electron/Electron.cpp b/Machines/Acorn/Electron/Electron.cpp index 6f42f8f4e..202d043fd 100644 --- a/Machines/Acorn/Electron/Electron.cpp +++ b/Machines/Acorn/Electron/Electron.cpp @@ -8,24 +8,24 @@ #include "Electron.hpp" -#include "../../../Activity/Source.hpp" -#include "../../MachineTypes.hpp" -#include "../../../Configurable/Configurable.hpp" +#include "Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" +#include "Configurable/Configurable.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" -#include "../../../ClockReceiver/ForceInline.hpp" -#include "../../../Configurable/StandardOptions.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../../Processors/6502/6502.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "ClockReceiver/ForceInline.hpp" +#include "Configurable/StandardOptions.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Processors/6502/6502.hpp" -#include "../../../Storage/MassStorage/SCSI/SCSI.hpp" -#include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp" -#include "../../../Storage/Tape/Tape.hpp" +#include "Storage/MassStorage/SCSI/SCSI.hpp" +#include "Storage/MassStorage/SCSI/DirectAccessDevice.hpp" +#include "Storage/Tape/Tape.hpp" -#include "../../Utility/Typer.hpp" -#include "../../../Analyser/Static/Acorn/Target.hpp" +#include "Machines/Utility/Typer.hpp" +#include "Analyser/Static/Acorn/Target.hpp" -#include "../../../ClockReceiver/JustInTime.hpp" +#include "ClockReceiver/JustInTime.hpp" #include "Interrupts.hpp" #include "Keyboard.hpp" diff --git a/Machines/Acorn/Electron/SoundGenerator.hpp b/Machines/Acorn/Electron/SoundGenerator.hpp index 53a2653b7..a34001438 100644 --- a/Machines/Acorn/Electron/SoundGenerator.hpp +++ b/Machines/Acorn/Electron/SoundGenerator.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../../Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" namespace Electron { diff --git a/Machines/Acorn/Electron/Video.hpp b/Machines/Acorn/Electron/Video.hpp index a79458786..f4b457b04 100644 --- a/Machines/Acorn/Electron/Video.hpp +++ b/Machines/Acorn/Electron/Video.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Outputs/CRT/CRT.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" #include "Interrupts.hpp" #include diff --git a/Machines/Amiga/Amiga.cpp b/Machines/Amiga/Amiga.cpp index 806c0bd45..6504b9370 100644 --- a/Machines/Amiga/Amiga.cpp +++ b/Machines/Amiga/Amiga.cpp @@ -8,17 +8,17 @@ #include "Amiga.hpp" -#include "../../Activity/Source.hpp" -#include "../MachineTypes.hpp" +#include "Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" -#include "../../Processors/68000/68000.hpp" +#include "Processors/68000/68000.hpp" -#include "../../Analyser/Static/Amiga/Target.hpp" +#include "Analyser/Static/Amiga/Target.hpp" -#include "../Utility/MemoryPacker.hpp" -#include "../Utility/MemoryFuzzer.hpp" +#include "Machines/Utility/MemoryPacker.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" #include "Chipset.hpp" #include "Keyboard.hpp" diff --git a/Machines/Amiga/Audio.hpp b/Machines/Amiga/Audio.hpp index 17c4bd304..e4a7f6739 100644 --- a/Machines/Amiga/Audio.hpp +++ b/Machines/Amiga/Audio.hpp @@ -12,9 +12,9 @@ #include #include "DMADevice.hpp" -#include "../../ClockReceiver/ClockReceiver.hpp" -#include "../../Concurrency/AsyncTaskQueue.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" namespace Amiga { diff --git a/Machines/Amiga/Blitter.cpp b/Machines/Amiga/Blitter.cpp index e384fe20a..464509751 100644 --- a/Machines/Amiga/Blitter.cpp +++ b/Machines/Amiga/Blitter.cpp @@ -9,7 +9,7 @@ #include "Blitter.hpp" #include "Minterms.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" #include diff --git a/Machines/Amiga/Chipset.cpp b/Machines/Amiga/Chipset.cpp index 3a7b0ccc3..e68a08fa4 100644 --- a/Machines/Amiga/Chipset.cpp +++ b/Machines/Amiga/Chipset.cpp @@ -8,7 +8,7 @@ #include "Chipset.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" #include #include diff --git a/Machines/Amiga/Chipset.hpp b/Machines/Amiga/Chipset.hpp index cdc16e968..d149c8988 100644 --- a/Machines/Amiga/Chipset.hpp +++ b/Machines/Amiga/Chipset.hpp @@ -14,14 +14,14 @@ #include #include -#include "../../Activity/Source.hpp" -#include "../../ClockReceiver/ClockingHintSource.hpp" -#include "../../ClockReceiver/JustInTime.hpp" -#include "../../Components/6526/6526.hpp" -#include "../../Outputs/CRT/CRT.hpp" -#include "../../Processors/68000/68000.hpp" -#include "../../Storage/Disk/Controller/DiskController.hpp" -#include "../../Storage/Disk/Drive.hpp" +#include "Activity/Source.hpp" +#include "ClockReceiver/ClockingHintSource.hpp" +#include "ClockReceiver/JustInTime.hpp" +#include "Components/6526/6526.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "Processors/68000/68000.hpp" +#include "Storage/Disk/Controller/DiskController.hpp" +#include "Storage/Disk/Drive.hpp" #include "Audio.hpp" #include "Bitplanes.hpp" diff --git a/Machines/Amiga/Copper.cpp b/Machines/Amiga/Copper.cpp index ef39af0ba..29dda2e27 100644 --- a/Machines/Amiga/Copper.cpp +++ b/Machines/Amiga/Copper.cpp @@ -9,7 +9,7 @@ #include "Copper.hpp" #include "Chipset.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" using namespace Amiga; diff --git a/Machines/Amiga/Disk.cpp b/Machines/Amiga/Disk.cpp index 6b2794809..29d693a45 100644 --- a/Machines/Amiga/Disk.cpp +++ b/Machines/Amiga/Disk.cpp @@ -8,7 +8,7 @@ #include "Chipset.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" namespace { Log::Logger logger; diff --git a/Machines/AmstradCPC/AmstradCPC.cpp b/Machines/AmstradCPC/AmstradCPC.cpp index 75a2c6d50..d4abca871 100644 --- a/Machines/AmstradCPC/AmstradCPC.cpp +++ b/Machines/AmstradCPC/AmstradCPC.cpp @@ -11,28 +11,28 @@ #include "Keyboard.hpp" #include "FDC.hpp" -#include "../../Processors/Z80/Z80.hpp" +#include "Processors/Z80/Z80.hpp" -#include "../../Components/6845/CRTC6845.hpp" -#include "../../Components/8255/i8255.hpp" -#include "../../Components/AY38910/AY38910.hpp" +#include "Components/6845/CRTC6845.hpp" +#include "Components/8255/i8255.hpp" +#include "Components/AY38910/AY38910.hpp" -#include "../Utility/MemoryFuzzer.hpp" -#include "../Utility/Typer.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" +#include "Machines/Utility/Typer.hpp" -#include "../../Activity/Source.hpp" -#include "../MachineTypes.hpp" +#include "Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" -#include "../../Storage/Tape/Tape.hpp" -#include "../../Storage/Tape/Parsers/Spectrum.hpp" +#include "Storage/Tape/Tape.hpp" +#include "Storage/Tape/Parsers/Spectrum.hpp" -#include "../../ClockReceiver/ForceInline.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ForceInline.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/CRT/CRT.hpp" -#include "../../Analyser/Static/AmstradCPC/Target.hpp" +#include "Analyser/Static/AmstradCPC/Target.hpp" -#include "../../Numeric/CRC.hpp" +#include "Numeric/CRC.hpp" #include #include diff --git a/Machines/Apple/ADB/ReactiveDevice.cpp b/Machines/Apple/ADB/ReactiveDevice.cpp index 04579459c..2dc3e7acb 100644 --- a/Machines/Apple/ADB/ReactiveDevice.cpp +++ b/Machines/Apple/ADB/ReactiveDevice.cpp @@ -8,7 +8,7 @@ #include "ReactiveDevice.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" using namespace Apple::ADB; diff --git a/Machines/Apple/AppleII/AppleII.cpp b/Machines/Apple/AppleII/AppleII.cpp index 566acac60..b5c481f1f 100644 --- a/Machines/Apple/AppleII/AppleII.cpp +++ b/Machines/Apple/AppleII/AppleII.cpp @@ -8,18 +8,18 @@ #include "AppleII.hpp" -#include "../../../Activity/Source.hpp" -#include "../../MachineTypes.hpp" -#include "../../Utility/MemoryFuzzer.hpp" -#include "../../Utility/StringSerialiser.hpp" +#include "Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" +#include "Machines/Utility/StringSerialiser.hpp" -#include "../../../Processors/6502/6502.hpp" -#include "../../../Components/AudioToggle/AudioToggle.hpp" -#include "../../../Components/AY38910/AY38910.hpp" +#include "Processors/6502/6502.hpp" +#include "Components/AudioToggle/AudioToggle.hpp" +#include "Components/AY38910/AY38910.hpp" -#include "../../../Outputs/Speaker/Implementation/CompoundSource.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Speaker/Implementation/CompoundSource.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Log.hpp" #include "AuxiliaryMemorySwitches.hpp" #include "Card.hpp" @@ -30,13 +30,13 @@ #include "SCSICard.hpp" #include "Video.hpp" -#include "../../../Analyser/Static/AppleII/Target.hpp" -#include "../../../ClockReceiver/ForceInline.hpp" -#include "../../../Configurable/StandardOptions.hpp" +#include "Analyser/Static/AppleII/Target.hpp" +#include "ClockReceiver/ForceInline.hpp" +#include "Configurable/StandardOptions.hpp" -#include "../../../Storage/MassStorage/SCSI/SCSI.hpp" -#include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp" -#include "../../../Storage/MassStorage/Encodings/MacintoshVolume.hpp" +#include "Storage/MassStorage/SCSI/SCSI.hpp" +#include "Storage/MassStorage/SCSI/DirectAccessDevice.hpp" +#include "Storage/MassStorage/Encodings/MacintoshVolume.hpp" #include #include diff --git a/Machines/Apple/AppleII/SCSICard.hpp b/Machines/Apple/AppleII/SCSICard.hpp index e1b15cc79..7126ccb82 100644 --- a/Machines/Apple/AppleII/SCSICard.hpp +++ b/Machines/Apple/AppleII/SCSICard.hpp @@ -9,15 +9,15 @@ #pragma once #include "Card.hpp" -#include "../../ROMMachine.hpp" +#include "Machines/ROMMachine.hpp" -#include "../../../Components/5380/ncr5380.hpp" +#include "Components/5380/ncr5380.hpp" -#include "../../../Storage/MassStorage/SCSI/SCSI.hpp" -#include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp" -#include "../../../Storage/MassStorage/MassStorageDevice.hpp" +#include "Storage/MassStorage/SCSI/SCSI.hpp" +#include "Storage/MassStorage/SCSI/DirectAccessDevice.hpp" +#include "Storage/MassStorage/MassStorageDevice.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" #include #include diff --git a/Machines/Apple/AppleII/Video.hpp b/Machines/Apple/AppleII/Video.hpp index 18af022c9..56be7ab43 100644 --- a/Machines/Apple/AppleII/Video.hpp +++ b/Machines/Apple/AppleII/Video.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Outputs/CRT/CRT.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" #include "VideoSwitches.hpp" diff --git a/Machines/Apple/AppleIIgs/ADB.cpp b/Machines/Apple/AppleIIgs/ADB.cpp index 283109af0..0c2e7a70b 100644 --- a/Machines/Apple/AppleIIgs/ADB.cpp +++ b/Machines/Apple/AppleIIgs/ADB.cpp @@ -13,10 +13,10 @@ #include // TEST. -#include "../../../InstructionSets/M50740/Parser.hpp" -#include "../../../InstructionSets/Disassembler.hpp" +#include "InstructionSets/M50740/Parser.hpp" +#include "InstructionSets/Disassembler.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" using namespace Apple::IIgs::ADB; diff --git a/Machines/Apple/AppleIIgs/AppleIIgs.cpp b/Machines/Apple/AppleIIgs/AppleIIgs.cpp index cc4ff2f6b..f76b52cf5 100644 --- a/Machines/Apple/AppleIIgs/AppleIIgs.cpp +++ b/Machines/Apple/AppleIIgs/AppleIIgs.cpp @@ -13,27 +13,27 @@ #include "Video.hpp" #include "Sound.hpp" -#include "../AppleII/Joystick.hpp" +#include "Machines/Apple/AppleII/Joystick.hpp" -#include "../../../Activity/Source.hpp" -#include "../../MachineTypes.hpp" +#include "Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" -#include "../../../Analyser/Static/AppleIIgs/Target.hpp" +#include "Analyser/Static/AppleIIgs/Target.hpp" -#include "../../../Processors/65816/65816.hpp" -#include "../../../Components/8530/z8530.hpp" -#include "../../../Components/AppleClock/AppleClock.hpp" -#include "../../../Components/AudioToggle/AudioToggle.hpp" -#include "../../../Components/DiskII/IWM.hpp" -#include "../../../Components/DiskII/MacintoshDoubleDensityDrive.hpp" -#include "../../../Components/DiskII/DiskIIDrive.hpp" +#include "Processors/65816/65816.hpp" +#include "Components/8530/z8530.hpp" +#include "Components/AppleClock/AppleClock.hpp" +#include "Components/AudioToggle/AudioToggle.hpp" +#include "Components/DiskII/IWM.hpp" +#include "Components/DiskII/MacintoshDoubleDensityDrive.hpp" +#include "Components/DiskII/DiskIIDrive.hpp" -#include "../../../Outputs/Speaker/Implementation/CompoundSource.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Speaker/Implementation/CompoundSource.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Utility/MemoryFuzzer.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" -#include "../../../ClockReceiver/JustInTime.hpp" +#include "ClockReceiver/JustInTime.hpp" #include #include diff --git a/Machines/Apple/AppleIIgs/Sound.hpp b/Machines/Apple/AppleIIgs/Sound.hpp index b217a59dc..7ff761716 100644 --- a/Machines/Apple/AppleIIgs/Sound.hpp +++ b/Machines/Apple/AppleIIgs/Sound.hpp @@ -10,9 +10,9 @@ #include -#include "../../../ClockReceiver/ClockReceiver.hpp" -#include "../../../Concurrency/AsyncTaskQueue.hpp" -#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" namespace Apple::IIgs::Sound { diff --git a/Machines/Apple/AppleIIgs/Video.hpp b/Machines/Apple/AppleIIgs/Video.hpp index 8845cd20c..eb4a9acee 100644 --- a/Machines/Apple/AppleIIgs/Video.hpp +++ b/Machines/Apple/AppleIIgs/Video.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../AppleII/VideoSwitches.hpp" -#include "../../../Outputs/CRT/CRT.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" +#include "Machines/Apple/AppleII/VideoSwitches.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" namespace Apple::IIgs::Video { diff --git a/Machines/Apple/Macintosh/Audio.hpp b/Machines/Apple/Macintosh/Audio.hpp index 762593aec..1b2c1e865 100644 --- a/Machines/Apple/Macintosh/Audio.hpp +++ b/Machines/Apple/Macintosh/Audio.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../../Concurrency/AsyncTaskQueue.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" -#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" #include #include diff --git a/Machines/Apple/Macintosh/DeferredAudio.hpp b/Machines/Apple/Macintosh/DeferredAudio.hpp index 95e13b3c1..d8b191a9f 100644 --- a/Machines/Apple/Macintosh/DeferredAudio.hpp +++ b/Machines/Apple/Macintosh/DeferredAudio.hpp @@ -9,7 +9,7 @@ #pragma once #include "Audio.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" namespace Apple::Macintosh { diff --git a/Machines/Apple/Macintosh/Macintosh.cpp b/Machines/Apple/Macintosh/Macintosh.cpp index cf8ac6adc..463915995 100644 --- a/Machines/Apple/Macintosh/Macintosh.cpp +++ b/Machines/Apple/Macintosh/Macintosh.cpp @@ -15,36 +15,36 @@ #include "Keyboard.hpp" #include "Video.hpp" -#include "../../MachineTypes.hpp" -#include "../../../Activity/Source.hpp" -#include "../../../Configurable/Configurable.hpp" +#include "Machines/MachineTypes.hpp" +#include "Activity/Source.hpp" +#include "Configurable/Configurable.hpp" -#include "../../../Inputs/QuadratureMouse/QuadratureMouse.hpp" -#include "../../../Outputs/Log.hpp" +#include "Inputs/QuadratureMouse/QuadratureMouse.hpp" +#include "Outputs/Log.hpp" -#include "../../../ClockReceiver/JustInTime.hpp" -#include "../../../ClockReceiver/ClockingHintSource.hpp" -#include "../../../Configurable/StandardOptions.hpp" +#include "ClockReceiver/JustInTime.hpp" +#include "ClockReceiver/ClockingHintSource.hpp" +#include "Configurable/StandardOptions.hpp" //#define LOG_TRACE -#include "../../../Components/5380/ncr5380.hpp" -#include "../../../Components/6522/6522.hpp" -#include "../../../Components/8530/z8530.hpp" -#include "../../../Components/AppleClock/AppleClock.hpp" -#include "../../../Components/DiskII/IWM.hpp" -#include "../../../Components/DiskII/MacintoshDoubleDensityDrive.hpp" +#include "Components/5380/ncr5380.hpp" +#include "Components/6522/6522.hpp" +#include "Components/8530/z8530.hpp" +#include "Components/AppleClock/AppleClock.hpp" +#include "Components/DiskII/IWM.hpp" +#include "Components/DiskII/MacintoshDoubleDensityDrive.hpp" -#include "../../../Processors/68000/68000.hpp" +#include "Processors/68000/68000.hpp" -#include "../../../Storage/MassStorage/SCSI/SCSI.hpp" -#include "../../../Storage/MassStorage/SCSI/DirectAccessDevice.hpp" -#include "../../../Storage/MassStorage/Encodings/MacintoshVolume.hpp" +#include "Storage/MassStorage/SCSI/SCSI.hpp" +#include "Storage/MassStorage/SCSI/DirectAccessDevice.hpp" +#include "Storage/MassStorage/Encodings/MacintoshVolume.hpp" -#include "../../../Analyser/Static/Macintosh/Target.hpp" +#include "Analyser/Static/Macintosh/Target.hpp" -#include "../../Utility/MemoryPacker.hpp" -#include "../../Utility/MemoryFuzzer.hpp" +#include "Machines/Utility/MemoryPacker.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" namespace { diff --git a/Machines/Apple/Macintosh/Video.hpp b/Machines/Apple/Macintosh/Video.hpp index 9149232d4..94f8d8bab 100644 --- a/Machines/Apple/Macintosh/Video.hpp +++ b/Machines/Apple/Macintosh/Video.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Outputs/CRT/CRT.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" #include "DeferredAudio.hpp" #include "DriveSpeedAccumulator.hpp" diff --git a/Machines/Atari/2600/Bus.hpp b/Machines/Atari/2600/Bus.hpp index 8ca72f41b..18a797a45 100644 --- a/Machines/Atari/2600/Bus.hpp +++ b/Machines/Atari/2600/Bus.hpp @@ -13,9 +13,9 @@ #include "TIA.hpp" #include "TIASound.hpp" -#include "../../../Analyser/Dynamic/ConfidenceCounter.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Analyser/Dynamic/ConfidenceCounter.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" namespace Atari2600 { diff --git a/Machines/Atari/2600/TIA.hpp b/Machines/Atari/2600/TIA.hpp index 71377ef1e..38b298699 100644 --- a/Machines/Atari/2600/TIA.hpp +++ b/Machines/Atari/2600/TIA.hpp @@ -13,8 +13,8 @@ #include #include -#include "../../../Outputs/CRT/CRT.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" namespace Atari2600 { diff --git a/Machines/Atari/2600/TIASound.hpp b/Machines/Atari/2600/TIASound.hpp index 36ffcc4e3..e4f34d1aa 100644 --- a/Machines/Atari/2600/TIASound.hpp +++ b/Machines/Atari/2600/TIASound.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../../Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" namespace Atari2600 { diff --git a/Machines/Atari/ST/AtariST.cpp b/Machines/Atari/ST/AtariST.cpp index 2743933d5..d98910279 100644 --- a/Machines/Atari/ST/AtariST.cpp +++ b/Machines/Atari/ST/AtariST.cpp @@ -8,33 +8,32 @@ #include "AtariST.hpp" -#include "../../MachineTypes.hpp" -#include "../../../Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" +#include "Activity/Source.hpp" //#define LOG_TRACE //bool should_log = false; -#include "../../../Processors/68000/68000.hpp" +#include "Processors/68000/68000.hpp" -#include "../../../Components/AY38910/AY38910.hpp" -#include "../../../Components/68901/MFP68901.hpp" -#include "../../../Components/6850/6850.hpp" +#include "Components/AY38910/AY38910.hpp" +#include "Components/68901/MFP68901.hpp" +#include "Components/6850/6850.hpp" #include "DMAController.hpp" #include "IntelligentKeyboard.hpp" #include "Video.hpp" -#include "../../../ClockReceiver/JustInTime.hpp" -#include "../../../ClockReceiver/ForceInline.hpp" -#include "../../../Configurable/StandardOptions.hpp" +#include "ClockReceiver/JustInTime.hpp" +#include "ClockReceiver/ForceInline.hpp" +#include "Configurable/StandardOptions.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Log.hpp" -#include "../../../Outputs/Log.hpp" +#include "Machines/Utility/MemoryPacker.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" -#include "../../Utility/MemoryPacker.hpp" -#include "../../Utility/MemoryFuzzer.hpp" - -#include "../../../Analyser/Static/AtariST/Target.hpp" +#include "Analyser/Static/AtariST/Target.hpp" namespace { Log::Logger logger; diff --git a/Machines/Atari/ST/DMAController.cpp b/Machines/Atari/ST/DMAController.cpp index f7c551fb8..3f9c24feb 100644 --- a/Machines/Atari/ST/DMAController.cpp +++ b/Machines/Atari/ST/DMAController.cpp @@ -8,7 +8,7 @@ #include "DMAController.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" #include diff --git a/Machines/Atari/ST/IntelligentKeyboard.cpp b/Machines/Atari/ST/IntelligentKeyboard.cpp index 5f4e6607c..aacd7ca29 100644 --- a/Machines/Atari/ST/IntelligentKeyboard.cpp +++ b/Machines/Atari/ST/IntelligentKeyboard.cpp @@ -8,7 +8,7 @@ #include "IntelligentKeyboard.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" #include diff --git a/Machines/Atari/ST/Video.cpp b/Machines/Atari/ST/Video.cpp index 90720c976..a5f7a748c 100644 --- a/Machines/Atari/ST/Video.cpp +++ b/Machines/Atari/ST/Video.cpp @@ -8,7 +8,7 @@ #include "Video.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" #include #include diff --git a/Machines/Atari/ST/Video.hpp b/Machines/Atari/ST/Video.hpp index ed1a6894e..d3d8ae753 100644 --- a/Machines/Atari/ST/Video.hpp +++ b/Machines/Atari/ST/Video.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../../Outputs/CRT/CRT.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" -#include "../../../ClockReceiver/DeferredQueue.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "ClockReceiver/DeferredQueue.hpp" #include diff --git a/Machines/AudioProducer.hpp b/Machines/AudioProducer.hpp index 4c72da239..fe54e11a4 100644 --- a/Machines/AudioProducer.hpp +++ b/Machines/AudioProducer.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Outputs/Speaker/Speaker.hpp" +#include "Outputs/Speaker/Speaker.hpp" namespace MachineTypes { diff --git a/Machines/ColecoVision/ColecoVision.cpp b/Machines/ColecoVision/ColecoVision.cpp index e5779318f..70932b14d 100644 --- a/Machines/ColecoVision/ColecoVision.cpp +++ b/Machines/ColecoVision/ColecoVision.cpp @@ -8,23 +8,23 @@ #include "ColecoVision.hpp" -#include "../../Processors/Z80/Z80.hpp" +#include "Processors/Z80/Z80.hpp" -#include "../../Components/9918/9918.hpp" -#include "../../Components/AY38910/AY38910.hpp" // For the Super Game Module. -#include "../../Components/SN76489/SN76489.hpp" +#include "Components/9918/9918.hpp" +#include "Components/AY38910/AY38910.hpp" // For the Super Game Module. +#include "Components/SN76489/SN76489.hpp" -#include "../MachineTypes.hpp" -#include "../../Configurable/Configurable.hpp" +#include "Machines/MachineTypes.hpp" +#include "Configurable/Configurable.hpp" -#include "../../Configurable/StandardOptions.hpp" -#include "../../ClockReceiver/ForceInline.hpp" -#include "../../ClockReceiver/JustInTime.hpp" +#include "Configurable/StandardOptions.hpp" +#include "ClockReceiver/ForceInline.hpp" +#include "ClockReceiver/JustInTime.hpp" -#include "../../Outputs/Speaker/Implementation/CompoundSource.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Speaker/Implementation/CompoundSource.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Analyser/Dynamic/ConfidenceCounter.hpp" +#include "Analyser/Dynamic/ConfidenceCounter.hpp" namespace { constexpr int sn76489_divider = 2; diff --git a/Machines/Commodore/Plus4/Audio.hpp b/Machines/Commodore/Plus4/Audio.hpp index cf0d7db88..0445f0362 100644 --- a/Machines/Commodore/Plus4/Audio.hpp +++ b/Machines/Commodore/Plus4/Audio.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../../Concurrency/AsyncTaskQueue.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" namespace Commodore::Plus4 { diff --git a/Machines/Commodore/Plus4/Plus4.cpp b/Machines/Commodore/Plus4/Plus4.cpp index 6de60402f..0808d5f37 100644 --- a/Machines/Commodore/Plus4/Plus4.cpp +++ b/Machines/Commodore/Plus4/Plus4.cpp @@ -14,23 +14,23 @@ #include "Pager.hpp" #include "Video.hpp" -#include "../../MachineTypes.hpp" -#include "../../Utility/MemoryFuzzer.hpp" -#include "../../../Processors/6502/6502.hpp" -#include "../../../Analyser/Static/Commodore/Target.hpp" -#include "../../../Outputs/Log.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../../Configurable/StandardOptions.hpp" +#include "Machines/MachineTypes.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" +#include "Processors/6502/6502.hpp" +#include "Analyser/Static/Commodore/Target.hpp" +#include "Outputs/Log.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Configurable/StandardOptions.hpp" -#include "../../../Analyser/Dynamic/ConfidenceCounter.hpp" -#include "../../../Analyser/Static/Commodore/Target.hpp" +#include "Analyser/Dynamic/ConfidenceCounter.hpp" +#include "Analyser/Static/Commodore/Target.hpp" -#include "../../../Storage/Tape/Parsers/Commodore.hpp" -#include "../../../Storage/Tape/Tape.hpp" -#include "../SerialBus.hpp" -#include "../1540/C1540.hpp" +#include "Storage/Tape/Parsers/Commodore.hpp" +#include "Storage/Tape/Tape.hpp" +#include "Machines/Commodore/SerialBus.hpp" +#include "Machines/Commodore/1540/C1540.hpp" -#include "../../../Processors/6502Esque/Implementation/LazyFlags.hpp" +#include "Processors/6502Esque/Implementation/LazyFlags.hpp" #include #include diff --git a/Machines/Commodore/Plus4/Video.hpp b/Machines/Commodore/Plus4/Video.hpp index e7a39a17f..0dabd956f 100644 --- a/Machines/Commodore/Plus4/Video.hpp +++ b/Machines/Commodore/Plus4/Video.hpp @@ -11,8 +11,8 @@ #include "Interrupts.hpp" #include "Pager.hpp" -#include "../../../Numeric/UpperBound.hpp" -#include "../../../Outputs/CRT/CRT.hpp" +#include "Numeric/UpperBound.hpp" +#include "Outputs/CRT/CRT.hpp" #include #include diff --git a/Machines/Commodore/Vic-20/Vic20.cpp b/Machines/Commodore/Vic-20/Vic20.cpp index 59d2d16b9..d35c9513c 100644 --- a/Machines/Commodore/Vic-20/Vic20.cpp +++ b/Machines/Commodore/Vic-20/Vic20.cpp @@ -10,28 +10,28 @@ #include "Keyboard.hpp" -#include "../../../Activity/Source.hpp" -#include "../../MachineTypes.hpp" +#include "Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" -#include "../../../Processors/6502/6502.hpp" -#include "../../../Components/6560/6560.hpp" -#include "../../../Components/6522/6522.hpp" +#include "Processors/6502/6502.hpp" +#include "Components/6560/6560.hpp" +#include "Components/6522/6522.hpp" -#include "../../../ClockReceiver/ForceInline.hpp" -#include "../../../Outputs/Log.hpp" +#include "ClockReceiver/ForceInline.hpp" +#include "Outputs/Log.hpp" -#include "../../../Storage/Tape/Parsers/Commodore.hpp" +#include "Storage/Tape/Parsers/Commodore.hpp" -#include "../SerialBus.hpp" -#include "../1540/C1540.hpp" +#include "Machines/Commodore/SerialBus.hpp" +#include "Machines/Commodore/1540/C1540.hpp" -#include "../../../Storage/Tape/Tape.hpp" -#include "../../../Storage/Disk/Disk.hpp" +#include "Storage/Tape/Tape.hpp" +#include "Storage/Disk/Disk.hpp" -#include "../../../Configurable/StandardOptions.hpp" +#include "Configurable/StandardOptions.hpp" -#include "../../../Analyser/Dynamic/ConfidenceCounter.hpp" -#include "../../../Analyser/Static/Commodore/Target.hpp" +#include "Analyser/Dynamic/ConfidenceCounter.hpp" +#include "Analyser/Static/Commodore/Target.hpp" #include #include diff --git a/Machines/Enterprise/Dave.hpp b/Machines/Enterprise/Dave.hpp index 7951ae1a6..cc1cbc050 100644 --- a/Machines/Enterprise/Dave.hpp +++ b/Machines/Enterprise/Dave.hpp @@ -10,10 +10,10 @@ #include -#include "../../ClockReceiver/ClockReceiver.hpp" -#include "../../Concurrency/AsyncTaskQueue.hpp" -#include "../../Numeric/LFSR.hpp" -#include "../../Outputs/Speaker/Implementation/BufferSource.hpp" +#include "ClockReceiver/ClockReceiver.hpp" +#include "Concurrency/AsyncTaskQueue.hpp" +#include "Numeric/LFSR.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" namespace Enterprise::Dave { diff --git a/Machines/Enterprise/Enterprise.cpp b/Machines/Enterprise/Enterprise.cpp index b675a6a84..696ab5abe 100644 --- a/Machines/Enterprise/Enterprise.cpp +++ b/Machines/Enterprise/Enterprise.cpp @@ -13,15 +13,15 @@ #include "Keyboard.hpp" #include "Nick.hpp" -#include "../MachineTypes.hpp" -#include "../Utility/Typer.hpp" +#include "Machines/MachineTypes.hpp" +#include "Machines/Utility/Typer.hpp" -#include "../../Activity/Source.hpp" -#include "../../Analyser/Static/Enterprise/Target.hpp" -#include "../../ClockReceiver/JustInTime.hpp" -#include "../../Outputs/Log.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Processors/Z80/Z80.hpp" +#include "Activity/Source.hpp" +#include "Analyser/Static/Enterprise/Target.hpp" +#include "ClockReceiver/JustInTime.hpp" +#include "Outputs/Log.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Processors/Z80/Z80.hpp" namespace { Log::Logger logger; diff --git a/Machines/Enterprise/Nick.hpp b/Machines/Enterprise/Nick.hpp index 1d790c67d..43371ee3c 100644 --- a/Machines/Enterprise/Nick.hpp +++ b/Machines/Enterprise/Nick.hpp @@ -8,9 +8,9 @@ #pragma once +#include "ClockReceiver/ClockReceiver.hpp" +#include "Outputs/CRT/CRT.hpp" #include -#include "../../ClockReceiver/ClockReceiver.hpp" -#include "../../Outputs/CRT/CRT.hpp" namespace Enterprise { diff --git a/Machines/MSX/MSX.cpp b/Machines/MSX/MSX.cpp index bc5535390..f7e11d157 100644 --- a/Machines/MSX/MSX.cpp +++ b/Machines/MSX/MSX.cpp @@ -8,46 +8,46 @@ #include "MSX.hpp" -#include - #include "DiskROM.hpp" #include "Keyboard.hpp" #include "MemorySlotHandler.hpp" -#include "../../Analyser/Static/MSX/Cartridge.hpp" -#include "Cartridges/ASCII8kb.hpp" -#include "Cartridges/ASCII16kb.hpp" -#include "Cartridges/Konami.hpp" -#include "Cartridges/KonamiWithSCC.hpp" +#include "Analyser/Static/MSX/Cartridge.hpp" +#include "Machines/MSX/Cartridges/ASCII8kb.hpp" +#include "Machines/MSX/Cartridges/ASCII16kb.hpp" +#include "Machines/MSX/Cartridges/Konami.hpp" +#include "Machines/MSX/Cartridges/KonamiWithSCC.hpp" -#include "../../Processors/Z80/Z80.hpp" +#include "Processors/Z80/Z80.hpp" -#include "../../Components/1770/1770.hpp" -#include "../../Components/8255/i8255.hpp" -#include "../../Components/9918/9918.hpp" -#include "../../Components/AudioToggle/AudioToggle.hpp" -#include "../../Components/AY38910/AY38910.hpp" -#include "../../Components/KonamiSCC/KonamiSCC.hpp" -#include "../../Components/OPx/OPLL.hpp" -#include "../../Components/RP5C01/RP5C01.hpp" +#include "Components/1770/1770.hpp" +#include "Components/8255/i8255.hpp" +#include "Components/9918/9918.hpp" +#include "Components/AudioToggle/AudioToggle.hpp" +#include "Components/AY38910/AY38910.hpp" +#include "Components/KonamiSCC/KonamiSCC.hpp" +#include "Components/OPx/OPLL.hpp" +#include "Components/RP5C01/RP5C01.hpp" -#include "../../Storage/Tape/Parsers/MSX.hpp" -#include "../../Storage/Tape/Tape.hpp" +#include "Storage/Tape/Parsers/MSX.hpp" +#include "Storage/Tape/Tape.hpp" -#include "../../Activity/Source.hpp" -#include "../MachineTypes.hpp" -#include "../../Configurable/Configurable.hpp" +#include "Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" +#include "Configurable/Configurable.hpp" -#include "../../Outputs/Log.hpp" -#include "../../Outputs/Speaker/Implementation/CompoundSource.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Outputs/Log.hpp" +#include "Outputs/Speaker/Implementation/CompoundSource.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../Configurable/StandardOptions.hpp" -#include "../../ClockReceiver/ForceInline.hpp" -#include "../../ClockReceiver/JustInTime.hpp" +#include "Configurable/StandardOptions.hpp" +#include "ClockReceiver/ForceInline.hpp" +#include "ClockReceiver/JustInTime.hpp" -#include "../../Analyser/Static/MSX/Target.hpp" +#include "Analyser/Static/MSX/Target.hpp" + +#include namespace { Log::Logger logger; diff --git a/Machines/MasterSystem/MasterSystem.cpp b/Machines/MasterSystem/MasterSystem.cpp index 525d2e065..7933dba81 100644 --- a/Machines/MasterSystem/MasterSystem.cpp +++ b/Machines/MasterSystem/MasterSystem.cpp @@ -8,24 +8,24 @@ #include "MasterSystem.hpp" -#include "../../Processors/Z80/Z80.hpp" +#include "Processors/Z80/Z80.hpp" -#include "../../Components/9918/9918.hpp" -#include "../../Components/SN76489/SN76489.hpp" -#include "../../Components/OPx/OPLL.hpp" +#include "Components/9918/9918.hpp" +#include "Components/SN76489/SN76489.hpp" +#include "Components/OPx/OPLL.hpp" -#include "../MachineTypes.hpp" -#include "../../Configurable/Configurable.hpp" +#include "Machines/MachineTypes.hpp" +#include "Configurable/Configurable.hpp" -#include "../../ClockReceiver/ForceInline.hpp" -#include "../../ClockReceiver/JustInTime.hpp" +#include "ClockReceiver/ForceInline.hpp" +#include "ClockReceiver/JustInTime.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Outputs/Speaker/Implementation/CompoundSource.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Speaker/Implementation/CompoundSource.hpp" -#include "../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" -#include "../../Analyser/Static/Sega/Target.hpp" +#include "Analyser/Static/Sega/Target.hpp" #include #include diff --git a/Machines/Oric/Oric.cpp b/Machines/Oric/Oric.cpp index 88c30a95a..6a19dd116 100644 --- a/Machines/Oric/Oric.cpp +++ b/Machines/Oric/Oric.cpp @@ -14,27 +14,27 @@ #include "Microdisc.hpp" #include "Video.hpp" -#include "../../Activity/Source.hpp" -#include "../MachineTypes.hpp" +#include "Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" -#include "../Utility/MemoryFuzzer.hpp" -#include "../Utility/StringSerialiser.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" +#include "Machines/Utility/StringSerialiser.hpp" -#include "../../Processors/6502Esque/6502Selector.hpp" -#include "../../Components/6522/6522.hpp" -#include "../../Components/AY38910/AY38910.hpp" -#include "../../Components/DiskII/DiskII.hpp" +#include "Processors/6502Esque/6502Selector.hpp" +#include "Components/6522/6522.hpp" +#include "Components/AY38910/AY38910.hpp" +#include "Components/DiskII/DiskII.hpp" -#include "../../Storage/Tape/Tape.hpp" -#include "../../Storage/Tape/Parsers/Oric.hpp" +#include "Storage/Tape/Tape.hpp" +#include "Storage/Tape/Parsers/Oric.hpp" -#include "../../ClockReceiver/ForceInline.hpp" -#include "../../Configurable/StandardOptions.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "ClockReceiver/ForceInline.hpp" +#include "Configurable/StandardOptions.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Analyser/Static/Oric/Target.hpp" +#include "Analyser/Static/Oric/Target.hpp" -#include "../../ClockReceiver/JustInTime.hpp" +#include "ClockReceiver/JustInTime.hpp" #include #include diff --git a/Machines/Oric/Video.hpp b/Machines/Oric/Video.hpp index b3bc5a2ea..127bfc093 100644 --- a/Machines/Oric/Video.hpp +++ b/Machines/Oric/Video.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../Outputs/CRT/CRT.hpp" -#include "../../ClockReceiver/ClockReceiver.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" #include #include diff --git a/Machines/PCCompatible/CGA.hpp b/Machines/PCCompatible/CGA.hpp index b3818c882..400df9979 100644 --- a/Machines/PCCompatible/CGA.hpp +++ b/Machines/PCCompatible/CGA.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../Components/6845/CRTC6845.hpp" -#include "../../Outputs/CRT/CRT.hpp" -#include "../../Machines/Utility/ROMCatalogue.hpp" +#include "Components/6845/CRTC6845.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "Machines/Utility/ROMCatalogue.hpp" namespace PCCompatible { diff --git a/Machines/PCCompatible/MDA.hpp b/Machines/PCCompatible/MDA.hpp index 3f1c0b378..1083713a6 100644 --- a/Machines/PCCompatible/MDA.hpp +++ b/Machines/PCCompatible/MDA.hpp @@ -8,9 +8,9 @@ #pragma once -#include "../../Components/6845/CRTC6845.hpp" -#include "../../Outputs/CRT/CRT.hpp" -#include "../../Machines/Utility/ROMCatalogue.hpp" +#include "Components/6845/CRTC6845.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "Machines/Utility/ROMCatalogue.hpp" namespace PCCompatible { diff --git a/Machines/PCCompatible/PCCompatible.cpp b/Machines/PCCompatible/PCCompatible.cpp index c9c74ac36..2d8d28fe0 100644 --- a/Machines/PCCompatible/PCCompatible.cpp +++ b/Machines/PCCompatible/PCCompatible.cpp @@ -17,34 +17,34 @@ #include "PIT.hpp" #include "RTC.hpp" -#include "../../Activity/Source.hpp" +#include "Activity/Source.hpp" -#include "../../InstructionSets/x86/Decoder.hpp" -#include "../../InstructionSets/x86/Flags.hpp" -#include "../../InstructionSets/x86/Instruction.hpp" -#include "../../InstructionSets/x86/Perform.hpp" +#include "InstructionSets/x86/Decoder.hpp" +#include "InstructionSets/x86/Flags.hpp" +#include "InstructionSets/x86/Instruction.hpp" +#include "InstructionSets/x86/Perform.hpp" -#include "../../Components/8255/i8255.hpp" -#include "../../Components/8272/CommandDecoder.hpp" -#include "../../Components/8272/Results.hpp" -#include "../../Components/8272/Status.hpp" -#include "../../Components/AudioToggle/AudioToggle.hpp" +#include "Components/8255/i8255.hpp" +#include "Components/8272/CommandDecoder.hpp" +#include "Components/8272/Results.hpp" +#include "Components/8272/Status.hpp" +#include "Components/AudioToggle/AudioToggle.hpp" -#include "../../Numeric/RegisterSizes.hpp" +#include "Numeric/RegisterSizes.hpp" -#include "../../Outputs/CRT/CRT.hpp" -#include "../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../Storage/Disk/Track/TrackSerialiser.hpp" -#include "../../Storage/Disk/Encodings/MFM/Parser.hpp" +#include "Storage/Disk/Track/TrackSerialiser.hpp" +#include "Storage/Disk/Encodings/MFM/Parser.hpp" -#include "../AudioProducer.hpp" -#include "../KeyboardMachine.hpp" -#include "../MediaTarget.hpp" -#include "../ScanProducer.hpp" -#include "../TimedMachine.hpp" +#include "Machines/AudioProducer.hpp" +#include "Machines/KeyboardMachine.hpp" +#include "Machines/MediaTarget.hpp" +#include "Machines/ScanProducer.hpp" +#include "Machines/TimedMachine.hpp" -#include "../../Analyser/Static/PCCompatible/Target.hpp" +#include "Analyser/Static/PCCompatible/Target.hpp" #include #include diff --git a/Machines/ScanProducer.hpp b/Machines/ScanProducer.hpp index 892514eee..ef02567ea 100644 --- a/Machines/ScanProducer.hpp +++ b/Machines/ScanProducer.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../Outputs/ScanTarget.hpp" -#include "../Configurable/StandardOptions.hpp" +#include "Outputs/ScanTarget.hpp" +#include "Configurable/StandardOptions.hpp" #include "TimedMachine.hpp" diff --git a/Machines/Sinclair/ZX8081/Video.hpp b/Machines/Sinclair/ZX8081/Video.hpp index c73b317e2..398a1948b 100644 --- a/Machines/Sinclair/ZX8081/Video.hpp +++ b/Machines/Sinclair/ZX8081/Video.hpp @@ -8,8 +8,8 @@ #pragma once -#include "../../../Outputs/CRT/CRT.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" namespace Sinclair::ZX8081 { diff --git a/Machines/Sinclair/ZX8081/ZX8081.cpp b/Machines/Sinclair/ZX8081/ZX8081.cpp index 0a206a673..766f70352 100644 --- a/Machines/Sinclair/ZX8081/ZX8081.cpp +++ b/Machines/Sinclair/ZX8081/ZX8081.cpp @@ -8,21 +8,21 @@ #include "ZX8081.hpp" -#include "../../MachineTypes.hpp" +#include "Machines/MachineTypes.hpp" -#include "../../../Components/AY38910/AY38910.hpp" -#include "../../../Processors/Z80/Z80.hpp" -#include "../../../Storage/Tape/Tape.hpp" -#include "../../../Storage/Tape/Parsers/ZX8081.hpp" +#include "Components/AY38910/AY38910.hpp" +#include "Processors/Z80/Z80.hpp" +#include "Storage/Tape/Tape.hpp" +#include "Storage/Tape/Parsers/ZX8081.hpp" -#include "../../../ClockReceiver/ForceInline.hpp" +#include "ClockReceiver/ForceInline.hpp" -#include "../../Utility/MemoryFuzzer.hpp" -#include "../../Utility/Typer.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" +#include "Machines/Utility/Typer.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../../Analyser/Static/ZX8081/Target.hpp" +#include "Analyser/Static/ZX8081/Target.hpp" #include "../Keyboard/Keyboard.hpp" #include "Video.hpp" diff --git a/Machines/Sinclair/ZXSpectrum/Video.hpp b/Machines/Sinclair/ZXSpectrum/Video.hpp index 10ef12302..7584a4b89 100644 --- a/Machines/Sinclair/ZXSpectrum/Video.hpp +++ b/Machines/Sinclair/ZXSpectrum/Video.hpp @@ -8,10 +8,10 @@ #pragma once -#include "../../../Outputs/CRT/CRT.hpp" -#include "../../../ClockReceiver/ClockReceiver.hpp" +#include "Outputs/CRT/CRT.hpp" +#include "ClockReceiver/ClockReceiver.hpp" -#include "../../../Reflection/Struct.hpp" +#include "Reflection/Struct.hpp" #include diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp index db02c0cf4..da64e521a 100644 --- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp +++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.cpp @@ -12,33 +12,33 @@ #include "Video.hpp" #include "Machines/Sinclair/Keyboard/Keyboard.hpp" -#include "../../../Activity/Source.hpp" -#include "../../MachineTypes.hpp" +#include "Activity/Source.hpp" +#include "Machines/MachineTypes.hpp" -#include "../../../Processors/Z80/Z80.hpp" +#include "Processors/Z80/Z80.hpp" -#include "../../../Components/AudioToggle/AudioToggle.hpp" -#include "../../../Components/AY38910/AY38910.hpp" +#include "Components/AudioToggle/AudioToggle.hpp" +#include "Components/AY38910/AY38910.hpp" // TODO: possibly there's a better factoring than this, but for now // just grab the CPC's version of an FDC. -#include "../../AmstradCPC/FDC.hpp" +#include "Machines/AmstradCPC/FDC.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" -#include "../../../Outputs/Speaker/Implementation/CompoundSource.hpp" -#include "../../../Outputs/Speaker/Implementation/LowpassSpeaker.hpp" -#include "../../../Outputs/Speaker/Implementation/BufferSource.hpp" +#include "Outputs/Speaker/Implementation/CompoundSource.hpp" +#include "Outputs/Speaker/Implementation/LowpassSpeaker.hpp" +#include "Outputs/Speaker/Implementation/BufferSource.hpp" -#include "../../../Storage/Tape/Tape.hpp" -#include "../../../Storage/Tape/Parsers/Spectrum.hpp" +#include "Storage/Tape/Tape.hpp" +#include "Storage/Tape/Parsers/Spectrum.hpp" -#include "../../../Analyser/Static/ZXSpectrum/Target.hpp" +#include "Analyser/Static/ZXSpectrum/Target.hpp" -#include "../../Utility/MemoryFuzzer.hpp" -#include "../../Utility/Typer.hpp" +#include "Machines/Utility/MemoryFuzzer.hpp" +#include "Machines/Utility/Typer.hpp" -#include "../../../ClockReceiver/JustInTime.hpp" +#include "ClockReceiver/JustInTime.hpp" #include diff --git a/OSBindings/Mac/Clock SignalTests/CPCShakerTests.mm b/OSBindings/Mac/Clock SignalTests/CPCShakerTests.mm index ad3cf1eab..28939513d 100644 --- a/OSBindings/Mac/Clock SignalTests/CPCShakerTests.mm +++ b/OSBindings/Mac/Clock SignalTests/CPCShakerTests.mm @@ -13,9 +13,9 @@ #include "CSL.hpp" #include "AmstradCPC.hpp" -#include "../../../Analyser/Static/AmstradCPC/Target.hpp" -#include "../../../Machines/AmstradCPC/Keyboard.hpp" -#include "../../../Outputs/ScanTarget.hpp" +#include "Analyser/Static/AmstradCPC/Target.hpp" +#include "Machines/AmstradCPC/Keyboard.hpp" +#include "Outputs/ScanTarget.hpp" #include "CSROMFetcher.hpp" #include "TimedMachine.hpp" #include "MediaTarget.hpp" diff --git a/OSBindings/SDL/main.cpp b/OSBindings/SDL/main.cpp index 07e40bec5..8282e9444 100644 --- a/OSBindings/SDL/main.cpp +++ b/OSBindings/SDL/main.cpp @@ -6,6 +6,22 @@ // Copyright 2017 Thomas Harte. All rights reserved. // +#include "Analyser/Static/StaticAnalyser.hpp" +#include "Machines/Utility/MachineForTarget.hpp" + +#include "ClockReceiver/TimeTypes.hpp" +#include "ClockReceiver/ScanSynchroniser.hpp" + +#include "Machines/MachineTypes.hpp" + +#include "Activity/Observer.hpp" +#include "Outputs/OpenGL/Primitives/Rectangle.hpp" +#include "Outputs/OpenGL/ScanTarget.hpp" +#include "Outputs/OpenGL/Screenshot.hpp" + +#include "Reflection/Enum.hpp" +#include "Reflection/Struct.hpp" + #include #include #include @@ -21,22 +37,6 @@ #include -#include "../../Analyser/Static/StaticAnalyser.hpp" -#include "../../Machines/Utility/MachineForTarget.hpp" - -#include "../../ClockReceiver/TimeTypes.hpp" -#include "../../ClockReceiver/ScanSynchroniser.hpp" - -#include "../../Machines/MachineTypes.hpp" - -#include "../../Activity/Observer.hpp" -#include "../../Outputs/OpenGL/Primitives/Rectangle.hpp" -#include "../../Outputs/OpenGL/ScanTarget.hpp" -#include "../../Outputs/OpenGL/Screenshot.hpp" - -#include "../../Reflection/Enum.hpp" -#include "../../Reflection/Struct.hpp" - namespace { struct MachineRunner { diff --git a/Storage/Disk/Track/PCMTrack.cpp b/Storage/Disk/Track/PCMTrack.cpp index 3fb87d535..b657459bf 100644 --- a/Storage/Disk/Track/PCMTrack.cpp +++ b/Storage/Disk/Track/PCMTrack.cpp @@ -7,7 +7,7 @@ // #include "PCMTrack.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" namespace { diff --git a/Storage/MassStorage/SCSI/DirectAccessDevice.cpp b/Storage/MassStorage/SCSI/DirectAccessDevice.cpp index fe623e455..f2b10e2fc 100644 --- a/Storage/MassStorage/SCSI/DirectAccessDevice.cpp +++ b/Storage/MassStorage/SCSI/DirectAccessDevice.cpp @@ -7,7 +7,7 @@ // #include "DirectAccessDevice.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" using namespace SCSI; diff --git a/Storage/MassStorage/SCSI/Target.hpp b/Storage/MassStorage/SCSI/Target.hpp index 4afa4307c..9e41aacd4 100644 --- a/Storage/MassStorage/SCSI/Target.hpp +++ b/Storage/MassStorage/SCSI/Target.hpp @@ -9,7 +9,7 @@ #pragma once #include "SCSI.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" #include #include diff --git a/Storage/State/SZX.cpp b/Storage/State/SZX.cpp index 055b4d3c8..1ef90a979 100644 --- a/Storage/State/SZX.cpp +++ b/Storage/State/SZX.cpp @@ -8,11 +8,11 @@ #include "SZX.hpp" -#include "../FileHolder.hpp" +#include "Storage/FileHolder.hpp" -#include "../../Analyser/Static/ZXSpectrum/Target.hpp" -#include "../../Machines/Sinclair/ZXSpectrum/State.hpp" -#include "../../Outputs/Log.hpp" +#include "Analyser/Static/ZXSpectrum/Target.hpp" +#include "Machines/Sinclair/ZXSpectrum/State.hpp" +#include "Outputs/Log.hpp" #include diff --git a/Storage/Tape/Formats/CAS.hpp b/Storage/Tape/Formats/CAS.hpp index 42e1143a8..3d9a78538 100644 --- a/Storage/Tape/Formats/CAS.hpp +++ b/Storage/Tape/Formats/CAS.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Tape.hpp" +#include "Storage/Tape/Tape.hpp" #include "../../FileHolder.hpp" #include diff --git a/Storage/Tape/Formats/CSW.hpp b/Storage/Tape/Formats/CSW.hpp index ddc36e43c..180d93740 100644 --- a/Storage/Tape/Formats/CSW.hpp +++ b/Storage/Tape/Formats/CSW.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Tape.hpp" +#include "Storage/Tape/Tape.hpp" #include #include diff --git a/Storage/Tape/Formats/CommodoreTAP.hpp b/Storage/Tape/Formats/CommodoreTAP.hpp index e276884f9..4abef0dd6 100644 --- a/Storage/Tape/Formats/CommodoreTAP.hpp +++ b/Storage/Tape/Formats/CommodoreTAP.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Tape.hpp" +#include "Storage/Tape/Tape.hpp" #include "../../FileHolder.hpp" #include "../../TargetPlatforms.hpp" diff --git a/Storage/Tape/Formats/OricTAP.hpp b/Storage/Tape/Formats/OricTAP.hpp index e8cfdfac0..0c3e79ba9 100644 --- a/Storage/Tape/Formats/OricTAP.hpp +++ b/Storage/Tape/Formats/OricTAP.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Tape.hpp" +#include "Storage/Tape/Tape.hpp" #include "../../FileHolder.hpp" #include diff --git a/Storage/Tape/Formats/TZX.cpp b/Storage/Tape/Formats/TZX.cpp index d6b269769..a0c68daa8 100644 --- a/Storage/Tape/Formats/TZX.cpp +++ b/Storage/Tape/Formats/TZX.cpp @@ -9,7 +9,7 @@ #include "TZX.hpp" #include "CSW.hpp" -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" using namespace Storage::Tape; diff --git a/Storage/Tape/Formats/TapePRG.hpp b/Storage/Tape/Formats/TapePRG.hpp index c26936a62..5c0702635 100644 --- a/Storage/Tape/Formats/TapePRG.hpp +++ b/Storage/Tape/Formats/TapePRG.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Tape.hpp" +#include "Storage/Tape/Tape.hpp" #include "../../FileHolder.hpp" #include "../../TargetPlatforms.hpp" diff --git a/Storage/Tape/Formats/TapeUEF.cpp b/Storage/Tape/Formats/TapeUEF.cpp index 29b30409c..7b666f43d 100644 --- a/Storage/Tape/Formats/TapeUEF.cpp +++ b/Storage/Tape/Formats/TapeUEF.cpp @@ -12,7 +12,7 @@ #include #include -#include "../../../Outputs/Log.hpp" +#include "Outputs/Log.hpp" namespace { Log::Logger logger; diff --git a/Storage/Tape/Formats/ZX80O81P.hpp b/Storage/Tape/Formats/ZX80O81P.hpp index 39f1b2734..1171c48ac 100644 --- a/Storage/Tape/Formats/ZX80O81P.hpp +++ b/Storage/Tape/Formats/ZX80O81P.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Tape.hpp" +#include "Storage/Tape/Tape.hpp" #include "../../FileHolder.hpp" #include "../../TargetPlatforms.hpp" diff --git a/Storage/Tape/Formats/ZXSpectrumTAP.hpp b/Storage/Tape/Formats/ZXSpectrumTAP.hpp index de3bbea79..9dd05a518 100644 --- a/Storage/Tape/Formats/ZXSpectrumTAP.hpp +++ b/Storage/Tape/Formats/ZXSpectrumTAP.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Tape.hpp" +#include "Storage/Tape/Tape.hpp" #include "../../FileHolder.hpp" #include diff --git a/Storage/Tape/Parsers/Commodore.hpp b/Storage/Tape/Parsers/Commodore.hpp index 3c6221232..6c665af12 100644 --- a/Storage/Tape/Parsers/Commodore.hpp +++ b/Storage/Tape/Parsers/Commodore.hpp @@ -9,7 +9,7 @@ #pragma once #include "TapeParser.hpp" -#include "../../TargetPlatforms.hpp" +#include "Storage/TargetPlatforms.hpp" #include #include diff --git a/Storage/Tape/Parsers/MSX.hpp b/Storage/Tape/Parsers/MSX.hpp index ed95856da..506439873 100644 --- a/Storage/Tape/Parsers/MSX.hpp +++ b/Storage/Tape/Parsers/MSX.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Tape.hpp" +#include "Storage/Tape/Tape.hpp" #include #include diff --git a/Storage/Tape/Parsers/TapeParser.hpp b/Storage/Tape/Parsers/TapeParser.hpp index 56471c474..b665050fd 100644 --- a/Storage/Tape/Parsers/TapeParser.hpp +++ b/Storage/Tape/Parsers/TapeParser.hpp @@ -8,7 +8,7 @@ #pragma once -#include "../Tape.hpp" +#include "Storage/Tape/Tape.hpp" #include #include diff --git a/Storage/Tape/Parsers/ZX8081.hpp b/Storage/Tape/Parsers/ZX8081.hpp index b830434d3..20708f5a6 100644 --- a/Storage/Tape/Parsers/ZX8081.hpp +++ b/Storage/Tape/Parsers/ZX8081.hpp @@ -10,7 +10,7 @@ #include "TapeParser.hpp" -#include "../../Data/ZX8081.hpp" +#include "Storage/Data/ZX8081.hpp" #include #include