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

Merge pull request #42 from davidgiven/deps

Browse Source 
Build file cleanup.
This commit is contained in:
David Given
2019-03-09 18:01:43 +01:00
committed by GitHub
parent 8b81097b91 c558028552
commit 98819cdd75
6 changed files with 187 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/stream/stream.cc → lib/fluxreader/kryoflux.cc
View File

@@ -1,6 +1,6 @@
#include "globals.h"
#include "fluxmap.h"
#include "stream.h"
#include "kryoflux.h"
#include "protocol.h"
#include "fmt/format.h"
#include <fstream>

0
lib/stream/stream.h → lib/fluxreader/kryoflux.h
View File

2
lib/fluxreader/streamfluxreader.cc
View File

@@ -1,6 +1,6 @@
#include "globals.h"
#include "fluxmap.h"
#include "stream.h"
#include "kryoflux.h"
#include "fluxreader.h"
class StreamFluxReader : public FluxReader

353
meson.build
View File

@@ -5,204 +5,219 @@ libusb = dependency('libusb-1.0')
sqlite = dependency('sqlite3')
zlib = dependency('zlib')
fmtlib = shared_library('fmtlib',
[
'dep/fmt/format.cc',
'dep/fmt/posix.cc'
])
fmtinc = include_directories('dep/fmt')
felib = shared_library('felib',
[
'lib/crc.cc',
'lib/dataspec.cc',
'lib/hexdump.cc',
'lib/sectorset.cc',
'lib/flags.cc',
'lib/fluxmap.cc',
'lib/globals.cc',
'lib/image.cc',
'lib/sector.cc',
'lib/usb.cc',
'lib/bytes.cc',
],
include_directories: [fmtinc],
link_with: [fmtlib],
dependencies: [libusb, zlib]
)
feinc = include_directories('lib')
sqllib = shared_library('sqllib',
['lib/sql.cc'],
include_directories: [feinc, fmtinc],
link_with: [felib, fmtlib],
dependencies: [sqlite]
fmtlib = declare_dependency(
link_with:
shared_library('fmtlib',
[
'dep/fmt/format.cc',
'dep/fmt/posix.cc'
]
),
include_directories:
include_directories('dep/fmt')
)
streamlib = shared_library('streamlib',
[ 'lib/stream/stream.cc', ],
include_directories: [feinc, fmtinc],
link_with: [felib, fmtlib]
felib = declare_dependency(
link_with:
shared_library('felib',
[
'lib/crc.cc',
'lib/dataspec.cc',
'lib/hexdump.cc',
'lib/sectorset.cc',
'lib/flags.cc',
'lib/fluxmap.cc',
'lib/globals.cc',
'lib/image.cc',
'lib/sector.cc',
'lib/usb.cc',
'lib/bytes.cc',
],
dependencies: [fmtlib, libusb, zlib]
),
include_directories:
include_directories('lib')
)
streaminc = include_directories('lib/stream')
fluxreaderlib = shared_library('fluxreaderlib',
[
'lib/fluxreader/fluxreader.cc',
'lib/fluxreader/sqlitefluxreader.cc',
'lib/fluxreader/hardwarefluxreader.cc',
'lib/fluxreader/streamfluxreader.cc',
],
include_directories: [feinc, fmtinc, streaminc],
link_with: [felib, streamlib, sqllib, fmtlib]
sqllib = declare_dependency(
link_with:
shared_library('sqllib',
['lib/sql.cc'],
dependencies: [fmtlib, felib, sqlite, zlib]
)
)
fluxreaderinc = include_directories('lib/fluxreader')
decoderlib = shared_library('decoderlib',
[
'lib/decoders/decoders.cc',
'lib/decoders/fmmfm.cc',
],
include_directories: [feinc, fmtinc],
link_with: [felib, fmtlib]
fluxreaderlib = declare_dependency(
link_with:
shared_library('fluxreaderlib',
[
'lib/fluxreader/fluxreader.cc',
'lib/fluxreader/sqlitefluxreader.cc',
'lib/fluxreader/hardwarefluxreader.cc',
'lib/fluxreader/streamfluxreader.cc',
'lib/fluxreader/kryoflux.cc',
],
dependencies: [fmtlib, felib, sqllib]
),
include_directories:
include_directories('lib/fluxreader')
)
decoderinc = include_directories('lib/decoders')
readerlib = shared_library('readerlib',
['lib/reader.cc'],
include_directories: [feinc, fmtinc, decoderinc, fluxreaderinc],
link_with: [felib, sqllib, fmtlib, decoderlib, fluxreaderlib])
decoderlib = declare_dependency(
link_with:
shared_library('decoderlib',
[
'lib/decoders/decoders.cc',
'lib/decoders/fmmfm.cc',
],
dependencies: [fmtlib, felib]
),
include_directories:
include_directories('lib/decoders')
)
readerlib = declare_dependency(
link_with:
shared_library('readerlib',
['lib/reader.cc'],
dependencies: [fmtlib, felib, sqllib, decoderlib, fluxreaderlib])
)
writerlib = shared_library('writerlib',
['lib/writer.cc'],
include_directories: [fmtinc],
link_with: [felib, sqllib, fmtlib])
encoderlib = shared_library('encoderlib',
[
'lib/encoder.cc',
],
include_directories: [feinc, fmtinc],
link_with: [felib, fmtlib]
writerlib = declare_dependency(
link_with:
shared_library('writerlib',
['lib/writer.cc'],
dependencies: [fmtlib, felib, sqllib]
)
)
aeslanierdecoderlib = shared_library('aeslanierdecoderlib',
[
'lib/aeslanier/decoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, decoderlib]
encoderlib = declare_dependency(
link_with:
shared_library('encoderlib',
['lib/encoder.cc'],
dependencies: [fmtlib, felib]
)
)
aeslanierinc = include_directories('lib/aeslanier')
amigadecoderlib = shared_library('amigadecoderlib',
[
'lib/amiga/decoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, decoderlib]
aeslanierdecoderlib = declare_dependency(
link_with:
shared_library('aeslanierdecoderlib',
[ 'lib/aeslanier/decoder.cc', ],
dependencies: [fmtlib, felib, decoderlib]),
include_directories:
include_directories('lib/aeslanier')
)
amigainc = include_directories('lib/amiga')
apple2decoderlib = shared_library('apple2decoderlib',
[
'lib/apple2/decoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, decoderlib]
amigadecoderlib = declare_dependency(
link_with:
shared_library('amigadecoderlib',
[ 'lib/amiga/decoder.cc', ],
dependencies: [fmtlib, felib, decoderlib]),
include_directories:
include_directories('lib/amiga')
)
apple2inc = include_directories('lib/apple2')
brotherdecoderlib = shared_library('brotherdecoderlib',
[
'lib/brother/decoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, decoderlib]
apple2decoderlib = declare_dependency(
link_with:
shared_library('apple2decoderlib',
[ 'lib/apple2/decoder.cc', ],
dependencies: [fmtlib, felib, decoderlib]),
include_directories:
include_directories('lib/apple2')
)
brotherencoderlib = shared_library('brotherencoderlib',
[
'lib/brother/encoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, encoderlib, decoderlib]
brotherdecoderlib = declare_dependency(
link_with:
shared_library('brotherdecoderlib',
[ 'lib/brother/decoder.cc', ],
dependencies: [fmtlib, felib, decoderlib]),
include_directories:
include_directories('lib/brother')
)
brotherinc = include_directories('lib/brother')
c64decoderlib = shared_library('c64decoderlib',
[
'lib/c64/decoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, decoderlib]
brotherencoderlib = declare_dependency(
link_with:
shared_library('brotherencoderlib',
[ 'lib/brother/encoder.cc', ],
dependencies: [fmtlib, felib, decoderlib, encoderlib]),
include_directories:
include_directories('lib/brother')
)
c64inc = include_directories('lib/c64')
ibmdecoderlib = shared_library('ibmdecoderlib',
[
'lib/ibm/decoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, decoderlib]
c64decoderlib = declare_dependency(
link_with:
shared_library('c64decoderlib',
[ 'lib/c64/decoder.cc', ],
dependencies: [fmtlib, felib, decoderlib]),
include_directories:
include_directories('lib/c64')
)
ibminc = include_directories('lib/ibm')
macdecoderlib = shared_library('macdecoderlib',
[
'lib/macintosh/decoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, decoderlib]
ibmdecoderlib = declare_dependency(
link_with:
shared_library('ibmdecoderlib',
[ 'lib/ibm/decoder.cc', ],
dependencies: [fmtlib, felib, decoderlib]),
include_directories:
include_directories('lib/ibm')
)
macinc = include_directories('lib/macintosh')
zilogmczdecoderlib = shared_library('zilogmczdecoderlib',
[
'lib/zilogmcz/decoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, decoderlib]
macdecoderlib = declare_dependency(
link_with:
shared_library('macdecoderlib',
[ 'lib/macintosh/decoder.cc', ],
dependencies: [fmtlib, felib, decoderlib]),
include_directories:
include_directories('lib/macintosh')
)
zilogmczinc = include_directories('lib/zilogmcz')
victor9kdecoderlib = shared_library('victor9kdecoderlib',
[
'lib/victor9k/decoder.cc',
],
include_directories: [feinc, fmtinc, decoderinc],
link_with: [felib, fmtlib, decoderlib]
zilogmczdecoderlib = declare_dependency(
link_with:
shared_library('zilogmczdecoderlib',
[ 'lib/zilogmcz/decoder.cc', ],
dependencies: [fmtlib, felib, decoderlib]),
include_directories:
include_directories('lib/zilogmcz')
)
victor9kinc = include_directories('lib/victor9k')
executable('fe-erase', ['src/fe-erase.cc'], include_directories: [feinc], link_with: [felib, writerlib])
executable('fe-inspect', ['src/fe-inspect.cc'], include_directories: [feinc, fmtinc, decoderinc], link_with: [felib, readerlib, decoderlib, fmtlib])
executable('fe-readadfs', ['src/fe-readadfs.cc'], include_directories: [feinc, fmtinc, decoderinc, ibminc], link_with: [felib, readerlib, decoderlib, ibmdecoderlib, fmtlib])
executable('fe-readaeslanier', ['src/fe-readaeslanier.cc'], include_directories: [feinc, fmtinc, decoderinc, aeslanierinc], link_with: [felib, readerlib, decoderlib, aeslanierdecoderlib, fmtlib])
executable('fe-readamiga', ['src/fe-readamiga.cc'], include_directories: [feinc, fmtinc, decoderinc, amigainc], link_with: [felib, readerlib, decoderlib, amigadecoderlib, fmtlib])
executable('fe-readampro', ['src/fe-readampro.cc'], include_directories: [feinc, fmtinc, decoderinc, ibminc], link_with: [felib, readerlib, decoderlib, ibmdecoderlib, fmtlib])
executable('fe-readapple2', ['src/fe-readapple2.cc'], include_directories: [feinc, fmtinc, decoderinc, apple2inc], link_with: [felib, readerlib, decoderlib, apple2decoderlib, fmtlib])
executable('fe-readbrother', ['src/fe-readbrother.cc'], include_directories: [feinc, fmtinc, decoderinc, brotherinc], link_with: [felib, readerlib, decoderlib, brotherdecoderlib, fmtlib])
executable('fe-readc64', ['src/fe-readc64.cc'], include_directories: [feinc, fmtinc, decoderinc, c64inc], link_with: [felib, readerlib, decoderlib, c64decoderlib, fmtlib])
executable('fe-readdfs', ['src/fe-readdfs.cc'], include_directories: [feinc, fmtinc, decoderinc, ibminc], link_with: [felib, readerlib, decoderlib, ibmdecoderlib, fmtlib])
executable('fe-readibm', ['src/fe-readibm.cc'], include_directories: [feinc, fmtinc, decoderinc, ibminc], link_with: [felib, readerlib, decoderlib, ibmdecoderlib, fmtlib])
executable('fe-readmac', ['src/fe-readmac.cc'], include_directories: [feinc, fmtinc, decoderinc, macinc], link_with: [felib, readerlib, decoderlib, macdecoderlib, fmtlib])
executable('fe-readzilogmcz', ['src/fe-readzilogmcz.cc'], include_directories: [feinc, fmtinc, decoderinc, zilogmczinc], link_with: [felib, readerlib, decoderlib, zilogmczdecoderlib, fmtlib])
executable('fe-readvictor9k', ['src/fe-readvictor9k.cc'], include_directories: [feinc, fmtinc, decoderinc, victor9kinc], link_with: [felib, readerlib, decoderlib, victor9kdecoderlib, fmtlib])
executable('fe-rpm', ['src/fe-rpm.cc'], include_directories: [feinc], link_with: [felib])
executable('fe-seek', ['src/fe-seek.cc'], include_directories: [feinc], link_with: [felib])
executable('fe-testbulktransport', ['src/fe-testbulktransport.cc'], include_directories: [feinc], link_with: [felib])
executable('fe-upgradefluxfile', ['src/fe-upgradefluxfile.cc'], include_directories: [feinc, fmtinc], link_with: [felib, fmtlib, sqllib])
executable('fe-writebrother', ['src/fe-writebrother.cc'], include_directories: [feinc, fmtinc, decoderinc, brotherinc], link_with: [felib, writerlib, decoderlib, encoderlib, brotherencoderlib, fmtlib])
executable('fe-writeflux', ['src/fe-writeflux.cc'], include_directories: [feinc, fmtinc], link_with: [felib, readerlib, writerlib, fmtlib])
executable('fe-writetestpattern', ['src/fe-writetestpattern.cc'], include_directories: [feinc, fmtinc], link_with: [felib, writerlib, fmtlib])
victor9kdecoderlib = declare_dependency(
link_with:
shared_library('victor9kdecoderlib',
[ 'lib/victor9k/decoder.cc', ],
dependencies: [fmtlib, felib, decoderlib]),
include_directories:
include_directories('lib/victor9k')
)
executable('brother120tool', ['tools/brother120tool.cc'], include_directories: [feinc, fmtinc], link_with: [felib, fmtlib])
executable('cwftoflux', ['tools/cwftoflux.cc'], include_directories: [feinc, fmtinc], link_with: [felib, fmtlib, sqllib])
executable('fe-erase', ['src/fe-erase.cc'], dependencies: [felib, writerlib])
executable('fe-inspect', ['src/fe-inspect.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib])
executable('fe-readadfs', ['src/fe-readadfs.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, ibmdecoderlib])
executable('fe-readaeslanier', ['src/fe-readaeslanier.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, aeslanierdecoderlib])
executable('fe-readamiga', ['src/fe-readamiga.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, amigadecoderlib])
executable('fe-readampro', ['src/fe-readampro.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, ibmdecoderlib])
executable('fe-readapple2', ['src/fe-readapple2.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, apple2decoderlib])
executable('fe-readbrother', ['src/fe-readbrother.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, brotherdecoderlib])
executable('fe-readc64', ['src/fe-readc64.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, c64decoderlib])
executable('fe-readdfs', ['src/fe-readdfs.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, ibmdecoderlib])
executable('fe-readibm', ['src/fe-readibm.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, ibmdecoderlib])
executable('fe-readmac', ['src/fe-readmac.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, macdecoderlib])
executable('fe-readzilogmcz', ['src/fe-readzilogmcz.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, zilogmczdecoderlib])
executable('fe-readvictor9k', ['src/fe-readvictor9k.cc'], dependencies: [fmtlib, felib, decoderlib, readerlib, victor9kdecoderlib])
executable('fe-rpm', ['src/fe-rpm.cc'], dependencies: [fmtlib, felib])
executable('fe-seek', ['src/fe-seek.cc'], dependencies: [fmtlib, felib])
executable('fe-testbulktransport', ['src/fe-testbulktransport.cc'], dependencies: [fmtlib, felib])
executable('fe-upgradefluxfile', ['src/fe-upgradefluxfile.cc'], dependencies: [fmtlib, felib, sqllib])
executable('fe-writebrother', ['src/fe-writebrother.cc'], dependencies: [fmtlib, felib, writerlib, decoderlib, encoderlib, brotherencoderlib])
executable('fe-writeflux', ['src/fe-writeflux.cc'], dependencies: [fmtlib, felib, readerlib, writerlib])
executable('fe-writetestpattern', ['src/fe-writetestpattern.cc'], dependencies: [fmtlib, felib, writerlib])
test('DataSpec', executable('dataspec-test', ['tests/dataspec.cc'], include_directories: [feinc], link_with: [felib]))
test('Flags', executable('flags-test', ['tests/flags.cc'], include_directories: [feinc], link_with: [felib]))
test('FmMfm', executable('fmmfm-test', ['tests/fmmfm.cc'], include_directories: [feinc, decoderinc], link_with: [felib, decoderlib]))
test('BitAccumulator', executable('bitaccumulator-test', ['tests/bitaccumulator.cc'], include_directories: [feinc], link_with: [felib]))
test('Kryoflux', executable('kryoflux-test', ['tests/kryoflux.cc'], include_directories: [feinc, decoderinc, streaminc], link_with: [felib, decoderlib, streamlib]))
test('Compression', executable('compression-test', ['tests/compression.cc'], include_directories: [feinc, decoderinc, streaminc], link_with: [felib, decoderlib, streamlib]))
test('Bytes', executable('bytes-test', ['tests/bytes.cc'], include_directories: [feinc], link_with: [felib]))
executable('brother120tool', ['tools/brother120tool.cc'], dependencies: [fmtlib, felib])
executable('cwftoflux', ['tools/cwftoflux.cc'], dependencies: [fmtlib, felib, sqllib])
test('DataSpec', executable('dataspec-test', ['tests/dataspec.cc'], dependencies: [felib]))
test('Flags', executable('flags-test', ['tests/flags.cc'], dependencies: [felib]))
test('FmMfm', executable('fmmfm-test', ['tests/fmmfm.cc'], dependencies: [felib, decoderlib]))
test('BitAccumulator', executable('bitaccumulator-test', ['tests/bitaccumulator.cc'], dependencies: [felib]))
test('Kryoflux', executable('kryoflux-test', ['tests/kryoflux.cc'], dependencies: [felib, decoderlib, fluxreaderlib]))
test('Compression', executable('compression-test', ['tests/compression.cc'], dependencies: [felib, decoderlib]))
test('Bytes', executable('bytes-test', ['tests/bytes.cc'], dependencies: [felib]))

1
src/fe-inspect.cc
View File

@@ -67,7 +67,6 @@ int main(int argc, const char* argv[])
nanoseconds_t nextclock = clockPeriod;
nanoseconds_t now = 0;
size_t cursor = 0;
nanoseconds_t seekto = seekFlag*1000000.0;
int ticks = 0;
FluxmapReader fr(*fluxmap);

2
tests/kryoflux.cc
View File

@@ -3,7 +3,7 @@
#include <stdlib.h>
#include "globals.h"
#include "fluxmap.h"
#include "stream.h"
#include "kryoflux.h"
struct memstreambuf : std::streambuf
{