Modularise fluxsource.

build.py

@@ -26,18 +26,6 @@ cxxlibrary(
         "./lib/decoders/fluxdecoder.cc",
         "./lib/decoders/fmmfm.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/d88imagereader.cc",
         "./lib/imagereader/dimimagereader.cc",
@@ -126,7 +114,6 @@ cxxlibrary(
         "lib/decoders/fluxdecoder.h": "./lib/decoders/fluxdecoder.h",
         "lib/decoders/rawbits.h": "./lib/decoders/rawbits.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/imagewriter/imagewriter.h": "./lib/imagewriter/imagewriter.h",
         "lib/readerwriter.h": "./lib/readerwriter.h",
@@ -145,7 +132,7 @@ cxxlibrary(
         "lib/data",
         "lib/external",
         "lib/fluxsink",
-        "lib/fluxsource+proto_lib",
+        "lib/fluxsource",
     ],
 )
 

lib/fluxsource/build.py

@@ -1,4 +1,5 @@
 from build.protobuf import proto, protocc
+from build.c import cxxlibrary
 
 proto(name="proto", srcs=["./fluxsource.proto"], deps=["lib+common_proto"])
 
@@ -7,3 +8,23 @@ protocc(
     srcs=[".+proto"],
     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"]
+)

lib/fluxsource/hardwarefluxsource.cc

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

src/build.py

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

src/gui/build.py

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