6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2025-02-16 18:30:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #646 from TomHarte/LinuxFixes

Browse Source 
Corrects hasty merge for more standards-compliant targets
This commit is contained in:
Thomas Harte 2019-09-18 22:07:57 -04:00 committed by GitHub
commit 55e003ccc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
OSBindings/SDL/SConstruct
View File

@ -36,6 +36,7 @@ SOURCES += glob.glob('../../Analyser/Static/Sega/*.cpp')
SOURCES += glob.glob('../../Analyser/Static/ZX8081/*.cpp') SOURCES += glob.glob('../../Analyser/Static/ZX8081/*.cpp')
SOURCES += glob.glob('../../Components/1770/*.cpp') SOURCES += glob.glob('../../Components/1770/*.cpp')
SOURCES += glob.glob('../../Components/5380/*.cpp')
SOURCES += glob.glob('../../Components/6522/Implementation/*.cpp') SOURCES += glob.glob('../../Components/6522/Implementation/*.cpp')
SOURCES += glob.glob('../../Components/6560/*.cpp') SOURCES += glob.glob('../../Components/6560/*.cpp')
SOURCES += glob.glob('../../Components/8272/*.cpp') SOURCES += glob.glob('../../Components/8272/*.cpp')
@ -97,6 +98,10 @@ SOURCES += glob.glob('../../Storage/Disk/Encodings/MFM/*.cpp')
SOURCES += glob.glob('../../Storage/Disk/Parsers/*.cpp') SOURCES += glob.glob('../../Storage/Disk/Parsers/*.cpp')
SOURCES += glob.glob('../../Storage/Disk/Track/*.cpp') SOURCES += glob.glob('../../Storage/Disk/Track/*.cpp')
SOURCES += glob.glob('../../Storage/Disk/Data/*.cpp') SOURCES += glob.glob('../../Storage/Disk/Data/*.cpp')
SOURCES += glob.glob('../../Storage/MassStorage/*.cpp')
SOURCES += glob.glob('../../Storage/MassStorage/Encodings/*.cpp')
SOURCES += glob.glob('../../Storage/MassStorage/Formats/*.cpp')
SOURCES += glob.glob('../../Storage/MassStorage/SCSI/*.cpp')
SOURCES += glob.glob('../../Storage/Tape/*.cpp') SOURCES += glob.glob('../../Storage/Tape/*.cpp')
SOURCES += glob.glob('../../Storage/Tape/Formats/*.cpp') SOURCES += glob.glob('../../Storage/Tape/Formats/*.cpp')
SOURCES += glob.glob('../../Storage/Tape/Parsers/*.cpp') SOURCES += glob.glob('../../Storage/Tape/Parsers/*.cpp')

2
Storage/MassStorage/Encodings/MacintoshVolume.hpp
View File

@ -11,6 +11,8 @@
#include <vector> #include <vector>
#include <cstdint> #include <cstdint>
#include <sys/types.h>
#include <unistd.h>
namespace Storage { namespace Storage {
namespace MassStorage { namespace MassStorage {

3
Storage/MassStorage/SCSI/Target.hpp
View File

@ -12,6 +12,7 @@
#include "SCSI.hpp" #include "SCSI.hpp"
#include "../../../Outputs/Log.hpp" #include "../../../Outputs/Log.hpp"
#include <cassert>
#include <cstring> #include <cstring>
#include <functional> #include <functional>
@ -393,7 +394,7 @@ template <typename Executor> class Target: public Bus::Observer, public Responde
continuation next_function_; continuation next_function_;
}; };
#import "TargetImplementation.hpp" #include "TargetImplementation.hpp"
} }
} }