salfter/fluxengine
1
0
Fork 0
mirror of https://github.com/davidgiven/fluxengine.git synced 2025-10-31 11:17:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Modularise fluxsource.

Browse Source
This commit is contained in:
David Given
2024-10-16 01:00:48 +02:00
parent c42e73f17a
commit ecd80775d8
5 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
build.py
View File

@@ -26,18 +26,6 @@ cxxlibrary(
"./lib/decoders/fluxdecoder.cc", "./lib/decoders/fluxdecoder.cc",
"./lib/decoders/fmmfm.cc", "./lib/decoders/fmmfm.cc",
"./lib/encoders/encoders.cc", "./lib/encoders/encoders.cc",
"./lib/fluxsource/a2rfluxsource.cc",
"./lib/fluxsource/cwffluxsource.cc",
"./lib/fluxsource/dmkfluxsource.cc",
"./lib/fluxsource/erasefluxsource.cc",
"./lib/fluxsource/fl2fluxsource.cc",
"./lib/fluxsource/fluxsource.cc",
"./lib/fluxsource/flxfluxsource.cc",
"./lib/fluxsource/hardwarefluxsource.cc",
"./lib/fluxsource/kryofluxfluxsource.cc",
"./lib/fluxsource/memoryfluxsource.cc",
"./lib/fluxsource/scpfluxsource.cc",
"./lib/fluxsource/testpatternfluxsource.cc",
"./lib/imagereader/d64imagereader.cc", "./lib/imagereader/d64imagereader.cc",
"./lib/imagereader/d88imagereader.cc", "./lib/imagereader/d88imagereader.cc",
"./lib/imagereader/dimimagereader.cc", "./lib/imagereader/dimimagereader.cc",
@@ -126,7 +114,6 @@ cxxlibrary(
"lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h", "lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
"lib/decoders/rawbits.h": "./lib/decoders/rawbits.h", "lib/decoders/rawbits.h": "./lib/decoders/rawbits.h",
"lib/encoders/encoders.h": "./lib/encoders/encoders.h", "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
"lib/fluxsource/fluxsource.h": "lib/fluxsource/fluxsource.h",
"lib/imagereader/imagereader.h": "./lib/imagereader/imagereader.h", "lib/imagereader/imagereader.h": "./lib/imagereader/imagereader.h",
"lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h", "lib/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
"lib/readerwriter.h": "./lib/readerwriter.h", "lib/readerwriter.h": "./lib/readerwriter.h",
@@ -145,7 +132,7 @@ cxxlibrary(
"lib/data", "lib/data",
"lib/external", "lib/external",
"lib/fluxsink", "lib/fluxsink",
"lib/fluxsource+proto_lib", "lib/fluxsource",
], ],
) )

21
lib/fluxsource/build.py
View File

@@ -1,4 +1,5 @@
from build.protobuf import proto, protocc from build.protobuf import proto, protocc
from build.c import cxxlibrary
proto(name="proto", srcs=["./fluxsource.proto"], deps=["lib+common_proto"]) proto(name="proto", srcs=["./fluxsource.proto"], deps=["lib+common_proto"])
@@ -7,3 +8,23 @@ protocc(
srcs=[".+proto"], srcs=[".+proto"],
deps=["lib+common_proto", "lib+common_proto_lib"], deps=["lib+common_proto", "lib+common_proto_lib"],
) )
cxxlibrary(
name="fluxsource",
srcs=[
"./a2rfluxsource.cc",
"./cwffluxsource.cc",
"./dmkfluxsource.cc",
"./erasefluxsource.cc",
"./fl2fluxsource.cc",
"./fluxsource.cc",
"./flxfluxsource.cc",
"./hardwarefluxsource.cc",
"./kryofluxfluxsource.cc",
"./memoryfluxsource.cc",
"./scpfluxsource.cc",
"./testpatternfluxsource.cc",
],
hdrs={"lib/fluxsource/fluxsource.h": "./fluxsource.h"},
deps=["lib/core","lib/data","lib/external","lib/usb",".+proto_lib"]
)

1
lib/fluxsource/hardwarefluxsource.cc
View File

@@ -7,7 +7,6 @@
#include "lib/usb/usb.h" #include "lib/usb/usb.h"
#include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/fluxsource.h"
#include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.pb.h"
#include "lib/readerwriter.h"
class HardwareFluxSource : public FluxSource class HardwareFluxSource : public FluxSource
{ {

2
src/build.py
View File

@@ -33,7 +33,6 @@ cxxprogram(
"+fmt_lib", "+fmt_lib",
"+lib", "+lib",
"+protobuf_lib", "+protobuf_lib",
"+protobuf_lib",
"+protocol", "+protocol",
"+z_lib", "+z_lib",
"dep/adflib", "dep/adflib",
@@ -46,7 +45,6 @@ cxxprogram(
"lib/core", "lib/core",
"lib/data", "lib/data",
"lib/external", "lib/external",
"lib/fluxsource+proto_lib",
"lib/vfs", "lib/vfs",
"src/formats", "src/formats",
], ],

1
src/gui/build.py
View File

@@ -68,7 +68,6 @@ cxxprogram(
"lib/data", "lib/data",
"lib/vfs", "lib/vfs",
"lib/config", "lib/config",
"lib/fluxsource+proto_lib",
"src/formats", "src/formats",
"src/gui/drivetypes", "src/gui/drivetypes",
"+z_lib", "+z_lib",