Remove stray dependencies to the system fmt.

2025-10-31 11:17:01 -07:00 · 2019-07-03 22:34:04 +02:00
parent e2bb13ab16
commit 20d143248b
22 changed files with 46 additions and 45 deletions
--- a/build.ninja
+++ b/build.ninja
@@ -120,53 +120,53 @@ build $OBJDIR/lib/zilogmcz/decoder.o : cxx lib/zilogmcz/decoder.cc
    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/libbackend.a : library $OBJDIR/lib/aeslanier/decoder.o $OBJDIR/lib/amiga/decoder.o $OBJDIR/lib/apple2/decoder.o $OBJDIR/lib/brother/decoder.o $OBJDIR/lib/brother/encoder.o $OBJDIR/lib/bytes.o $OBJDIR/lib/c64/decoder.o $OBJDIR/lib/common/crunch.c.o $OBJDIR/lib/crc.o $OBJDIR/lib/dataspec.o $OBJDIR/lib/decoders/decoders.o $OBJDIR/lib/decoders/fluxmapreader.o $OBJDIR/lib/decoders/fmmfm.o $OBJDIR/lib/encoder.o $OBJDIR/lib/f85/decoder.o $OBJDIR/lib/fb100/decoder.o $OBJDIR/lib/flags.o $OBJDIR/lib/fluxmap.o $OBJDIR/lib/fluxsink/fluxsink.o $OBJDIR/lib/fluxsink/hardwarefluxsink.o $OBJDIR/lib/fluxsink/sqlitefluxsink.o $OBJDIR/lib/fluxsource/fluxsource.o $OBJDIR/lib/fluxsource/hardwarefluxsource.o $OBJDIR/lib/fluxsource/kryoflux.o $OBJDIR/lib/fluxsource/sqlitefluxsource.o $OBJDIR/lib/fluxsource/streamfluxsource.o $OBJDIR/lib/globals.o $OBJDIR/lib/hexdump.o $OBJDIR/lib/ibm/decoder.o $OBJDIR/lib/image.o $OBJDIR/lib/macintosh/decoder.o $OBJDIR/lib/reader.o $OBJDIR/lib/sector.o $OBJDIR/lib/sectorset.o $OBJDIR/lib/sql.o $OBJDIR/lib/usb.o $OBJDIR/lib/victor9k/decoder.o $OBJDIR/lib/writer.o $OBJDIR/lib/zilogmcz/decoder.o
 build $OBJDIR/src/fe-erase.o : cxx src/fe-erase.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-inspect.o : cxx src/fe-inspect.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readadfs.o : cxx src/fe-readadfs.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readaeslanier.o : cxx src/fe-readaeslanier.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readamiga.o : cxx src/fe-readamiga.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readampro.o : cxx src/fe-readampro.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readapple2.o : cxx src/fe-readapple2.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readbrother.o : cxx src/fe-readbrother.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readc64.o : cxx src/fe-readc64.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readdfs.o : cxx src/fe-readdfs.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readf85.o : cxx src/fe-readf85.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readfb100.o : cxx src/fe-readfb100.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readibm.o : cxx src/fe-readibm.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readmac.o : cxx src/fe-readmac.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readvictor9k.o : cxx src/fe-readvictor9k.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-readzilogmcz.o : cxx src/fe-readzilogmcz.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-rpm.o : cxx src/fe-rpm.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-seek.o : cxx src/fe-seek.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-testbulktransport.o : cxx src/fe-testbulktransport.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-upgradefluxfile.o : cxx src/fe-upgradefluxfile.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-writebrother.o : cxx src/fe-writebrother.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-writeflux.o : cxx src/fe-writeflux.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fe-writetestpattern.o : cxx src/fe-writetestpattern.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/src/fluxengine.o : cxx src/fluxengine.cc
-    flags= -Ilib
+    flags= -Ilib -I/usr/include/libusb-1.0 -Idep/fmt
 build $OBJDIR/libfrontend.a : library $OBJDIR/src/fe-erase.o $OBJDIR/src/fe-inspect.o $OBJDIR/src/fe-readadfs.o $OBJDIR/src/fe-readaeslanier.o $OBJDIR/src/fe-readamiga.o $OBJDIR/src/fe-readampro.o $OBJDIR/src/fe-readapple2.o $OBJDIR/src/fe-readbrother.o $OBJDIR/src/fe-readc64.o $OBJDIR/src/fe-readdfs.o $OBJDIR/src/fe-readf85.o $OBJDIR/src/fe-readfb100.o $OBJDIR/src/fe-readibm.o $OBJDIR/src/fe-readmac.o $OBJDIR/src/fe-readvictor9k.o $OBJDIR/src/fe-readzilogmcz.o $OBJDIR/src/fe-rpm.o $OBJDIR/src/fe-seek.o $OBJDIR/src/fe-testbulktransport.o $OBJDIR/src/fe-upgradefluxfile.o $OBJDIR/src/fe-writebrother.o $OBJDIR/src/fe-writeflux.o $OBJDIR/src/fe-writetestpattern.o $OBJDIR/src/fluxengine.o
 build fluxengine : link $OBJDIR/libfrontend.a $OBJDIR/libbackend.a $OBJDIR/libfmt.a
    flags= -lz -lsqlite3 -lusb-1.0
--- a/dep/fmt/fmt/format.h
+++ b/dep/fmt/fmt/format.h
@@ -3416,7 +3416,7 @@ auto join(const Range &range, wstring_view sep)

  **Example**::

-    #include <fmt/format.h>
+    #include "fmt/format.h"

    std::string answer = fmt::to_string(42);
  \endrst
@@ -3697,7 +3697,7 @@ FMT_END_NAMESPACE
  **Example**::

    #define FMT_STRING_ALIAS 1
-    #include <fmt/format.h>
+    #include "fmt/format.h"
    // A compile-time error because 'd' is an invalid specifier for strings.
    std::string s = format(fmt("{:d}"), "foo");
  \endrst
--- a/lib/usb.cc
+++ b/lib/usb.cc
@@ -5,7 +5,7 @@
 #include "bytes.h"
 #include "common/crunch.h"
 #include <libusb.h>
-#include <fmt/format.h>
+#include "fmt/format.h"

 #define TIMEOUT 5000

--- a/mkninja.sh
+++ b/mkninja.sh
@@ -174,6 +174,7 @@ buildlibrary libbackend.a \

 buildlibrary libfrontend.a \
    -Ilib \
+    $pkgcflags \
    src/fe-erase.cc \
    src/fe-inspect.cc \
    src/fe-readadfs.cc \
--- a/src/fe-inspect.cc
+++ b/src/fe-inspect.cc
@@ -10,7 +10,7 @@
 #include "record.h"
 #include "sector.h"
 #include "track.h"
-#include <fmt/format.h>
+#include "fmt/format.h"

 static FlagGroup flags;

--- a/src/fe-readadfs.cc
+++ b/src/fe-readadfs.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "record.h"
 #include "ibm/ibm.h"
-#include <fmt/format.h>
+#include "fmt/format.h"

 static FlagGroup flags { &readerFlags };

--- a/src/fe-readaeslanier.cc
+++ b/src/fe-readaeslanier.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "record.h"
 #include "aeslanier/aeslanier.h"
-#include <fmt/format.h>
+#include "fmt/format.h"

 static FlagGroup flags { &readerFlags };

--- a/src/fe-readamiga.cc
+++ b/src/fe-readamiga.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "image.h"
 #include "record.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>

 static FlagGroup flags { &readerFlags };
--- a/src/fe-readampro.cc
+++ b/src/fe-readampro.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "record.h"
 #include "ibm/ibm.h"
-#include <fmt/format.h>
+#include "fmt/format.h"

 static FlagGroup flags { &readerFlags };

--- a/src/fe-readapple2.cc
+++ b/src/fe-readapple2.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "image.h"
 #include "record.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>

 static FlagGroup flags { &readerFlags };
--- a/src/fe-readbrother.cc
+++ b/src/fe-readbrother.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "image.h"
 #include "record.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>

 static FlagGroup flags { &readerFlags };
--- a/src/fe-readc64.cc
+++ b/src/fe-readc64.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "image.h"
 #include "record.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>

 static FlagGroup flags { &readerFlags };
--- a/src/fe-readdfs.cc
+++ b/src/fe-readdfs.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "record.h"
 #include "ibm/ibm.h"
-#include <fmt/format.h>
+#include "fmt/format.h"

 static FlagGroup flags { &readerFlags };

--- a/src/fe-readf85.cc
+++ b/src/fe-readf85.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "image.h"
 #include "record.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>

 static FlagGroup flags { &readerFlags };
--- a/src/fe-readfb100.cc
+++ b/src/fe-readfb100.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "record.h"
 #include "fb100/fb100.h"
-#include <fmt/format.h>
+#include "fmt/format.h"

 static FlagGroup flags { &readerFlags };

--- a/src/fe-readibm.cc
+++ b/src/fe-readibm.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "record.h"
 #include "ibm/ibm.h"
-#include <fmt/format.h>
+#include "fmt/format.h"

 static FlagGroup flags { &readerFlags };

--- a/src/fe-readmac.cc
+++ b/src/fe-readmac.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "image.h"
 #include "record.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>

 static FlagGroup flags { &readerFlags };
--- a/src/fe-readvictor9k.cc
+++ b/src/fe-readvictor9k.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "image.h"
 #include "record.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>

 static FlagGroup flags { &readerFlags };
--- a/src/fe-readzilogmcz.cc
+++ b/src/fe-readzilogmcz.cc
@@ -8,7 +8,7 @@
 #include "sectorset.h"
 #include "record.h"
 #include "zilogmcz/zilogmcz.h"
-#include <fmt/format.h>
+#include "fmt/format.h"

 static FlagGroup flags { &readerFlags };

--- a/src/fe-writebrother.cc
+++ b/src/fe-writebrother.cc
@@ -7,7 +7,7 @@
 #include "brother/brother.h"
 #include "image.h"
 #include "writer.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>
 #include <ctype.h>

--- a/src/fe-writeflux.cc
+++ b/src/fe-writeflux.cc
@@ -6,7 +6,7 @@
 #include "record.h"
 #include "sector.h"
 #include "track.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>
 #include <ctype.h>

--- a/src/fe-writetestpattern.cc
+++ b/src/fe-writetestpattern.cc
@@ -4,7 +4,7 @@
 #include "fluxmap.h"
 #include "writer.h"
 #include "protocol.h"
-#include <fmt/format.h>
+#include "fmt/format.h"
 #include <fstream>
 #include <ctype.h>