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

Move the flx stuff into external.

Browse Source
This commit is contained in:
David Given
2024-10-16 00:00:09 +02:00
parent 900ba11623
commit ec271a67ad
6 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.py
View File

@@ -39,7 +39,6 @@ cxxlibrary(
"./lib/fluxsource/erasefluxsource.cc", "./lib/fluxsource/erasefluxsource.cc",
"./lib/fluxsource/fl2fluxsource.cc", "./lib/fluxsource/fl2fluxsource.cc",
"./lib/fluxsource/fluxsource.cc", "./lib/fluxsource/fluxsource.cc",
"./lib/fluxsource/flx.cc",
"./lib/fluxsource/flxfluxsource.cc", "./lib/fluxsource/flxfluxsource.cc",
"./lib/fluxsource/hardwarefluxsource.cc", "./lib/fluxsource/hardwarefluxsource.cc",
"./lib/fluxsource/kryofluxfluxsource.cc", "./lib/fluxsource/kryofluxfluxsource.cc",
@@ -143,7 +142,6 @@ cxxlibrary(
"lib/encoders/encoders.h": "./lib/encoders/encoders.h", "lib/encoders/encoders.h": "./lib/encoders/encoders.h",
"lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h", "lib/fluxsink/fluxsink.h": "./lib/fluxsink/fluxsink.h",
"lib/fluxsource/fluxsource.h": "lib/fluxsource/fluxsource.h", "lib/fluxsource/fluxsource.h": "lib/fluxsource/fluxsource.h",
"lib/fluxsource/flx.h": "lib/fluxsource/flx.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",

2
lib/external/build.py vendored
View File

@@ -12,6 +12,7 @@ cxxlibrary(
"./kryoflux.cc", "./kryoflux.cc",
"./catweasel.cc", "./catweasel.cc",
"./csvreader.cc", "./csvreader.cc",
"./flx.cc",
], ],
hdrs={ hdrs={
"lib/external/a2r.h": "./a2r.h", "lib/external/a2r.h": "./a2r.h",
@@ -21,6 +22,7 @@ cxxlibrary(
"lib/external/kryoflux.h": "./kryoflux.h", "lib/external/kryoflux.h": "./kryoflux.h",
"lib/external/ldbs.h": "./ldbs.h", "lib/external/ldbs.h": "./ldbs.h",
"lib/external/scp.h": "./scp.h", "lib/external/scp.h": "./scp.h",
"lib/external/flx.h": "./flx.h",
}, },
deps=["lib/core", ".+fl2_proto_lib", "lib/data"], deps=["lib/core", ".+fl2_proto_lib", "lib/data"],
) )

2
lib/fluxsource/flx.cc → lib/external/flx.cc vendored
View File

@@ -2,7 +2,7 @@
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "lib/external/kryoflux.h" #include "lib/external/kryoflux.h"
#include "protocol.h" #include "protocol.h"
#include "lib/fluxsource/flx.h" #include "lib/external/flx.h"
std::unique_ptr<Fluxmap> readFlxBytes(const Bytes& bytes) std::unique_ptr<Fluxmap> readFlxBytes(const Bytes& bytes)
{ {

0
lib/fluxsource/flx.h → lib/external/flx.h vendored
View File

2
lib/fluxsource/flxfluxsource.cc
View File

@@ -2,7 +2,7 @@
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "lib/fluxsource/fluxsource.pb.h" #include "lib/fluxsource/fluxsource.pb.h"
#include "lib/fluxsource/fluxsource.h" #include "lib/fluxsource/fluxsource.h"
#include "lib/fluxsource/flx.h" #include "lib/external/flx.h"
class FlxFluxSource : public TrivialFluxSource class FlxFluxSource : public TrivialFluxSource
{ {

2
tests/flx.cc
View File

@@ -3,7 +3,7 @@
#include <stdlib.h> #include <stdlib.h>
#include "lib/core/globals.h" #include "lib/core/globals.h"
#include "lib/data/fluxmap.h" #include "lib/data/fluxmap.h"
#include "lib/fluxsource/flx.h" #include "lib/external/flx.h"
static void test_convert(const Bytes& flxbytes, const Bytes& fluxmapbytes) static void test_convert(const Bytes& flxbytes, const Bytes& fluxmapbytes)
{ {