6502/CLK
1
0
Fork 0
mirror of https://github.com/TomHarte/CLK.git synced 2026-03-11 19:41:57 +00:00
Code Issues Projects Releases Wiki Activity

Reorganise.

Browse Source
This commit is contained in:
Thomas Harte
2026-02-02 14:05:19 -05:00
parent c060af1494
commit 61474bc70b
13 changed files with 36 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
OSBindings/Mac/Clock Signal.xcodeproj/project.pbxproj
View File

@@ -1162,14 +1162,14 @@
4BCF1FA41DADC3DD0039D2E7 /* Oric.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BCF1FA21DADC3DD0039D2E7 /* Oric.cpp */; };
4BD0FBC3233706A200148981 /* CSApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 4BD0FBC2233706A200148981 /* CSApplication.m */; };
4BD191F52191180E0042E144 /* ScanTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD191F22191180E0042E144 /* ScanTarget.cpp */; };
4BD235B42F27AC680094AFAE /* CompositionShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235B32F27AC680094AFAE /* CompositionShader.cpp */; };
4BD235B72F2C11A40094AFAE /* VertexArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235B62F2C11A40094AFAE /* VertexArray.cpp */; };
4BD235BA2F2C22280094AFAE /* CopyShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235B92F2C22280094AFAE /* CopyShader.cpp */; };
4BD235BD2F2D60C90094AFAE /* Texture.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235BC2F2D60C90094AFAE /* Texture.cpp */; };
4BD235C32F312C0C0094AFAE /* CopyShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235C12F312C0C0094AFAE /* CopyShader.cpp */; };
4BD235C42F312C0C0094AFAE /* CompositionShader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235BF2F312C0C0094AFAE /* CompositionShader.cpp */; };
4BD235C72F312C3A0094AFAE /* Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD235C62F312C3A0094AFAE /* Rectangle.cpp */; };
4BD388882239E198002D14B5 /* 68000Tests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BD388872239E198002D14B5 /* 68000Tests.mm */; };
4BD424E02193B5340097291A /* TextureTarget.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424DD2193B5340097291A /* TextureTarget.cpp */; };
4BD424E62193B5830097291A /* Shader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424E12193B5820097291A /* Shader.cpp */; };
4BD424E82193B5830097291A /* Rectangle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD424E22193B5820097291A /* Rectangle.cpp */; };
4BD468F71D8DF41D0084958B /* 1770.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD468F51D8DF41D0084958B /* 1770.cpp */; };
4BD4A8D01E077FD20020D856 /* PCMTrackTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4BD4A8CF1E077FD20020D856 /* PCMTrackTests.mm */; };
4BD5D2692199148100DDF17D /* ScanTargetGLSLFragments.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4BD5D2672199148100DDF17D /* ScanTargetGLSLFragments.cpp */; };
@@ -2464,21 +2464,21 @@
4BD191D9219113B80042E144 /* OpenGL.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = OpenGL.hpp; sourceTree = "<group>"; };
4BD191F22191180E0042E144 /* ScanTarget.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = ScanTarget.cpp; sourceTree = "<group>"; };
4BD191F32191180E0042E144 /* ScanTarget.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = ScanTarget.hpp; sourceTree = "<group>"; };
4BD235B22F27AC680094AFAE /* CompositionShader.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CompositionShader.hpp; sourceTree = "<group>"; };
4BD235B32F27AC680094AFAE /* CompositionShader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CompositionShader.cpp; sourceTree = "<group>"; };
4BD235B52F2C11A40094AFAE /* VertexArray.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = VertexArray.hpp; sourceTree = "<group>"; };
4BD235B62F2C11A40094AFAE /* VertexArray.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = VertexArray.cpp; sourceTree = "<group>"; };
4BD235B82F2C22280094AFAE /* CopyShader.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CopyShader.hpp; sourceTree = "<group>"; };
4BD235B92F2C22280094AFAE /* CopyShader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CopyShader.cpp; sourceTree = "<group>"; };
4BD235BB2F2D60C90094AFAE /* Texture.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Texture.hpp; sourceTree = "<group>"; };
4BD235BC2F2D60C90094AFAE /* Texture.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Texture.cpp; sourceTree = "<group>"; };
4BD235BE2F312C0C0094AFAE /* CompositionShader.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CompositionShader.hpp; sourceTree = "<group>"; };
4BD235BF2F312C0C0094AFAE /* CompositionShader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CompositionShader.cpp; sourceTree = "<group>"; };
4BD235C02F312C0C0094AFAE /* CopyShader.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = CopyShader.hpp; sourceTree = "<group>"; };
4BD235C12F312C0C0094AFAE /* CopyShader.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = CopyShader.cpp; sourceTree = "<group>"; };
4BD235C52F312C3A0094AFAE /* Rectangle.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = Rectangle.hpp; sourceTree = "<group>"; };
4BD235C62F312C3A0094AFAE /* Rectangle.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Rectangle.cpp; sourceTree = "<group>"; };
4BD388411FE34E010042B588 /* 9918Base.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = 9918Base.hpp; sourceTree = "<group>"; };
4BD388872239E198002D14B5 /* 68000Tests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = 68000Tests.mm; sourceTree = "<group>"; };
4BD424DD2193B5340097291A /* TextureTarget.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextureTarget.cpp; sourceTree = "<group>"; };
4BD424DE2193B5340097291A /* TextureTarget.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = TextureTarget.hpp; sourceTree = "<group>"; };
4BD424E12193B5820097291A /* Shader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Shader.cpp; sourceTree = "<group>"; };
4BD424E22193B5820097291A /* Rectangle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Rectangle.cpp; sourceTree = "<group>"; };
4BD424E32193B5830097291A /* Rectangle.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Rectangle.hpp; sourceTree = "<group>"; };
4BD424E42193B5830097291A /* Shader.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = Shader.hpp; sourceTree = "<group>"; };
4BD468F51D8DF41D0084958B /* 1770.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = 1770.cpp; sourceTree = "<group>"; };
4BD468F61D8DF41D0084958B /* 1770.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = 1770.hpp; sourceTree = "<group>"; };
@@ -5388,21 +5388,31 @@
4BD191D5219113B80042E144 /* OpenGL */ = {
isa = PBXGroup;
children = (
4BD235B32F27AC680094AFAE /* CompositionShader.cpp */,
4BD235B92F2C22280094AFAE /* CopyShader.cpp */,
4BD191F22191180E0042E144 /* ScanTarget.cpp */,
4BD5D2672199148100DDF17D /* ScanTargetGLSLFragments.cpp */,
4BA3AF5C2EF252320088C3BC /* API.hpp */,
4BD235B22F27AC680094AFAE /* CompositionShader.hpp */,
4BD235B82F2C22280094AFAE /* CopyShader.hpp */,
4BD191D9219113B80042E144 /* OpenGL.hpp */,
4BD191F32191180E0042E144 /* ScanTarget.hpp */,
4B961408222760E0001A7BF2 /* Screenshot.hpp */,
4BD424DC2193B5340097291A /* Primitives */,
4BD235C22F312C0C0094AFAE /* Shaders */,
);
path = OpenGL;
sourceTree = "<group>";
};
4BD235C22F312C0C0094AFAE /* Shaders */ = {
isa = PBXGroup;
children = (
4BD235BF2F312C0C0094AFAE /* CompositionShader.cpp */,
4BD235C12F312C0C0094AFAE /* CopyShader.cpp */,
4BD235C62F312C3A0094AFAE /* Rectangle.cpp */,
4BD235BE2F312C0C0094AFAE /* CompositionShader.hpp */,
4BD235C02F312C0C0094AFAE /* CopyShader.hpp */,
4BD235C52F312C3A0094AFAE /* Rectangle.hpp */,
);
path = Shaders;
sourceTree = "<group>";
};
4BD388431FE34E060042B588 /* Implementation */ = {
isa = PBXGroup;
children = (
@@ -5424,12 +5434,10 @@
4BD424DC2193B5340097291A /* Primitives */ = {
isa = PBXGroup;
children = (
4BD424E22193B5820097291A /* Rectangle.cpp */,
4BD424E12193B5820097291A /* Shader.cpp */,
4BD235BC2F2D60C90094AFAE /* Texture.cpp */,
4BD424DD2193B5340097291A /* TextureTarget.cpp */,
4BD235B62F2C11A40094AFAE /* VertexArray.cpp */,
4BD424E32193B5830097291A /* Rectangle.hpp */,
4BD424E42193B5830097291A /* Shader.hpp */,
4BD235BB2F2D60C90094AFAE /* Texture.hpp */,
4BD424DE2193B5340097291A /* TextureTarget.hpp */,
@@ -6280,7 +6288,6 @@
4B2E86D025D8D8C70024F1E9 /* Keyboard.cpp in Sources */,
4B89452F201967B4007DE474 /* StaticAnalyser.cpp in Sources */,
4B894531201967B4007DE474 /* StaticAnalyser.cpp in Sources */,
4BD235BA2F2C22280094AFAE /* CopyShader.cpp in Sources */,
4BB5057B2B962DDF0031C43C /* Electron.cpp in Sources */,
4B0ACC2D23775819008902D0 /* IntelligentKeyboard.cpp in Sources */,
4B894539201967B4007DE474 /* Tape.cpp in Sources */,
@@ -6346,6 +6353,7 @@
4B055AEE1FAE9BBF0060FFFF /* Keyboard.cpp in Sources */,
4B7773522DE894E400933F03 /* JFD.cpp in Sources */,
4BF0BC722973318E00CCA2B5 /* RP5C01.cpp in Sources */,
4BD235C72F312C3A0094AFAE /* Rectangle.cpp in Sources */,
4B055AED1FAE9BA20060FFFF /* Z80Storage.cpp in Sources */,
4B1B88BC202E2EC100B67DFF /* MultiKeyboardMachine.cpp in Sources */,
4BC890D4230F86020025A55A /* DirectAccessDevice.cpp in Sources */,
@@ -6430,6 +6438,8 @@
4BE2121A253FCE9C00435408 /* AppleIIgs.cpp in Sources */,
4B051CAD26783E2000CA44E8 /* Nick.cpp in Sources */,
4B89451F201967B4007DE474 /* Tape.cpp in Sources */,
4BD235C32F312C0C0094AFAE /* CopyShader.cpp in Sources */,
4BD235C42F312C0C0094AFAE /* CompositionShader.cpp in Sources */,
4B055AA81FAE85EF0060FFFF /* Shifter.cpp in Sources */,
4BEDA3BC25B25563000C2DBD /* Decoder.cpp in Sources */,
4B8318B422D3E546006DB630 /* DriveSpeedAccumulator.cpp in Sources */,
@@ -6454,7 +6464,6 @@
4BAF2B4F2004580C00480230 /* DMK.cpp in Sources */,
4BC080D126A257A200D03FD8 /* StaticAnalyser.cpp in Sources */,
4BC3A9A32F147F8900ACC885 /* FilterGenerator.cpp in Sources */,
4BD424E82193B5830097291A /* Rectangle.cpp in Sources */,
4B055A961FAE85BB0060FFFF /* Commodore.cpp in Sources */,
4B8318BA22D3E579006DB630 /* MacintoshIMG.cpp in Sources */,
4B8318B822D3E566006DB630 /* IWM.cpp in Sources */,
@@ -6483,7 +6492,6 @@
4B055AB91FAE86170060FFFF /* Acorn.cpp in Sources */,
4B302185208A550100773308 /* DiskII.cpp in Sources */,
42EB81292B23AAC300429AF4 /* IMD.cpp in Sources */,
4BD235B42F27AC680094AFAE /* CompositionShader.cpp in Sources */,
4B051CB1267C1CA200CA44E8 /* Keyboard.cpp in Sources */,
4B8855A72E84D51B00E251DD /* SAA5050.cpp in Sources */,
4B0F1BB32602645900B85C66 /* StaticAnalyser.cpp in Sources */,

2
OSBindings/Qt/clksignal.pro
View File

@@ -125,6 +125,7 @@ SOURCES += \
$$SRC/Outputs/ScanTargets/*.cpp \
$$SRC/Outputs/OpenGL/*.cpp \
$$SRC/Outputs/OpenGL/Primitives/*.cpp \
$$SRC/Outputs/OpenGL/Shaders/*.cpp \
\
$$SRC/Processors/6502/Implementation/*.cpp \
$$SRC/Processors/6502/State/*.cpp \
@@ -272,6 +273,7 @@ HEADERS += \
$$SRC/Outputs/ScanTargets/*.hpp \
$$SRC/Outputs/OpenGL/*.hpp \
$$SRC/Outputs/OpenGL/Primitives/*.hpp \
$$SRC/Outputs/OpenGL/Shaders/*.hpp \
$$SRC/Outputs/Speaker/*.hpp \
$$SRC/Outputs/Speaker/Implementation/*.hpp \
\

1
OSBindings/SDL/SConstruct
View File

@@ -107,6 +107,7 @@ SOURCES += glob.glob('../../Outputs/CRT/*.cpp')
SOURCES += glob.glob('../../Outputs/ScanTargets/*.cpp')
SOURCES += glob.glob('../../Outputs/OpenGL/*.cpp')
SOURCES += glob.glob('../../Outputs/OpenGL/Primitives/*.cpp')
SOURCES += glob.glob('../../Outputs/OpenGL/Shaders/*.cpp')
SOURCES += glob.glob('../../Processors/6502/Implementation/*.cpp')
SOURCES += glob.glob('../../Processors/6502/State/*.cpp')

2
OSBindings/SDL/main.cpp
View File

@@ -15,7 +15,7 @@
#include "Machines/MachineTypes.hpp"
#include "Activity/Observer.hpp"
#include "Outputs/OpenGL/Primitives/Rectangle.hpp"
#include "Outputs/OpenGL/Shaders/Rectangle.hpp"
#include "Outputs/OpenGL/ScanTarget.hpp"
#include "Outputs/OpenGL/Screenshot.hpp"

4
Outputs/OpenGL/ScanTarget.cpp
View File

@@ -11,8 +11,8 @@
#include "OpenGL.hpp"
#include "Outputs/ScanTargets/FilterGenerator.hpp"
#include "CompositionShader.hpp"
#include "CopyShader.hpp"
#include "Outputs/OpenGL/Shaders/CompositionShader.hpp"
#include "Outputs/OpenGL/Shaders/CopyShader.hpp"
#include <algorithm>
#include <cassert>

2
Outputs/OpenGL/ScanTarget.hpp
View File

@@ -14,7 +14,7 @@
#include "API.hpp"
#include "OpenGL.hpp"
#include "Primitives/Rectangle.hpp"
#include "Shaders/Rectangle.hpp"
#include "Primitives/Texture.hpp"
#include "Primitives/TextureTarget.hpp"
#include "Primitives/VertexArray.hpp"

0
Outputs/OpenGL/CompositionShader.cpp → Outputs/OpenGL/Shaders/CompositionShader.cpp
View File

0
Outputs/OpenGL/CompositionShader.hpp → Outputs/OpenGL/Shaders/CompositionShader.hpp
View File

0
Outputs/OpenGL/CopyShader.cpp → Outputs/OpenGL/Shaders/CopyShader.cpp
View File

0
Outputs/OpenGL/CopyShader.hpp → Outputs/OpenGL/Shaders/CopyShader.hpp
View File

0
Outputs/OpenGL/Primitives/Rectangle.cpp → Outputs/OpenGL/Shaders/Rectangle.cpp
View File

0
Outputs/OpenGL/Primitives/Rectangle.hpp → Outputs/OpenGL/Shaders/Rectangle.hpp
View File

6
cmake/CLK_SOURCES.cmake
View File

@@ -159,13 +159,13 @@ set(CLK_SOURCES
Outputs/CRT/CRT.cpp
Outputs/DisplayMetrics.cpp
Outputs/OpenGL/Primitives/Rectangle.cpp
Outputs/OpenGL/Primitives/Shader.cpp
Outputs/OpenGL/Primitives/Texture.cpp
Outputs/OpenGL/Primitives/TextureTarget.cpp
Outputs/OpenGL/Primitives/VertexArray.cpp
Outputs/OpenGL/CompositionShader.cpp
Outputs/OpenGL/CopyShader.cpp
Outputs/OpenGL/Shaders/Rectangle.cpp
Outputs/OpenGL/Shaders/CompositionShader.cpp
Outputs/OpenGL/Shaders/CopyShader.cpp
Outputs/OpenGL/ScanTarget.cpp
Outputs/OpenGL/ScanTargetGLSLFragments.cpp
Outputs/ScanTarget.cpp