From f5b14cadf8c51098b4d60b76c2ce1f669ccc1d3f Mon Sep 17 00:00:00 2001 From: David Given Date: Wed, 9 Oct 2024 15:10:22 +0200 Subject: [PATCH] Use "" to access the fmt headers, not <>, or else Windows can't find the fallback library. --- arch/tids990/decoder.cc | 2 +- arch/tids990/encoder.cc | 2 +- lib/core/globals.h | 2 +- lib/fluxsink/a2rfluxsink.cc | 2 +- lib/globals.h | 2 +- lib/vfs/cpmfs.cc | 2 +- lib/vfs/microdos.cc | 2 +- lib/vfs/vfs.h | 2 +- scripts/mkdoc.cc | 2 +- scripts/mkdocindex.cc | 2 +- scripts/protoencode.cc | 2 +- src/fe-testdevices.cc | 2 +- src/fluxengine.cc | 2 +- tests/configs.cc | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/arch/tids990/decoder.cc b/arch/tids990/decoder.cc index 009514055..9a308c382 100644 --- a/arch/tids990/decoder.cc +++ b/arch/tids990/decoder.cc @@ -8,7 +8,7 @@ #include "lib/decoders/fluxpattern.h" #include "lib/sector.h" #include -#include +#include "fmt/format.h" /* The Texas Instruments DS990 uses MFM with a scheme similar to a simplified * version of the IBM record scheme (it's actually easier to parse than IBM). diff --git a/arch/tids990/encoder.cc b/arch/tids990/encoder.cc index fd9915238..f7d883926 100644 --- a/arch/tids990/encoder.cc +++ b/arch/tids990/encoder.cc @@ -7,7 +7,7 @@ #include "lib/image.h" #include "arch/tids990/tids990.pb.h" #include "lib/encoders/encoders.pb.h" -#include +#include "fmt/format.h" static int charToInt(char c) { diff --git a/lib/core/globals.h b/lib/core/globals.h index c3b3ace15..b249aac6a 100644 --- a/lib/core/globals.h +++ b/lib/core/globals.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include "fmt/format.h" #if defined(_WIN32) || defined(__WIN32__) #include diff --git a/lib/fluxsink/a2rfluxsink.cc b/lib/fluxsink/a2rfluxsink.cc index 870a9e79e..75e320a30 100644 --- a/lib/fluxsink/a2rfluxsink.cc +++ b/lib/fluxsink/a2rfluxsink.cc @@ -14,7 +14,7 @@ #include #include #include -#include +#include "fmt/chrono.h" namespace { diff --git a/lib/globals.h b/lib/globals.h index 0c1976320..96f8f0d68 100644 --- a/lib/globals.h +++ b/lib/globals.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include "fmt/format.h" #if defined(_WIN32) || defined(__WIN32__) #include diff --git a/lib/vfs/cpmfs.cc b/lib/vfs/cpmfs.cc index 525555c3f..fb7c67cd9 100644 --- a/lib/vfs/cpmfs.cc +++ b/lib/vfs/cpmfs.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/vfs/vfs.h" #include "lib/config.pb.h" -#include +#include "fmt/format.h" #include class CpmFsFilesystem : public Filesystem, public HasBitmap, public HasMount diff --git a/lib/vfs/microdos.cc b/lib/vfs/microdos.cc index 9987ededc..d95bddc98 100644 --- a/lib/vfs/microdos.cc +++ b/lib/vfs/microdos.cc @@ -2,7 +2,7 @@ #include "lib/vfs/vfs.h" #include "lib/config.pb.h" #include "lib/core/utils.h" -#include +#include "fmt/format.h" /* See https://www.hp9845.net/9845/projects/hpdir/#lif_filesystem for * a description. */ diff --git a/lib/vfs/vfs.h b/lib/vfs/vfs.h index 7f8c1b25e..74bda7146 100644 --- a/lib/vfs/vfs.h +++ b/lib/vfs/vfs.h @@ -2,7 +2,7 @@ #define VFS_H #include "lib/core/bytes.h" -#include +#include "fmt/format.h" class Sector; class Image; diff --git a/scripts/mkdoc.cc b/scripts/mkdoc.cc index 287d4ca34..a26ecf9a1 100644 --- a/scripts/mkdoc.cc +++ b/scripts/mkdoc.cc @@ -1,7 +1,7 @@ #include "lib/globals.h" #include "lib/proto.h" #include "lib/flags.h" -#include +#include "fmt/format.h" extern const std::map formats; diff --git a/scripts/mkdocindex.cc b/scripts/mkdocindex.cc index cfdaad127..bdf767a07 100644 --- a/scripts/mkdocindex.cc +++ b/scripts/mkdocindex.cc @@ -1,7 +1,7 @@ #include "lib/globals.h" #include "lib/proto.h" #include "lib/flags.h" -#include +#include "fmt/format.h" extern const std::map formats; diff --git a/scripts/protoencode.cc b/scripts/protoencode.cc index bd81f0e6e..12e4ebe91 100644 --- a/scripts/protoencode.cc +++ b/scripts/protoencode.cc @@ -2,7 +2,7 @@ #include #include #include -#include +#include "fmt/format.h" #include "tests/testproto.pb.h" #include "lib/config.pb.h" #include diff --git a/src/fe-testdevices.cc b/src/fe-testdevices.cc index 8aac8c1c6..373d525b5 100644 --- a/src/fe-testdevices.cc +++ b/src/fe-testdevices.cc @@ -1,7 +1,7 @@ #include "lib/core/globals.h" #include "lib/flags.h" #include "lib/usb/usbfinder.h" -#include +#include "fmt/format.h" static FlagGroup flags; diff --git a/src/fluxengine.cc b/src/fluxengine.cc index 3f8744743..566889986 100644 --- a/src/fluxengine.cc +++ b/src/fluxengine.cc @@ -1,6 +1,6 @@ #include "lib/core/globals.h" #include "lib/proto.h" -#include +#include "fmt/format.h" typedef int command_cb(int agrc, const char* argv[]); diff --git a/tests/configs.cc b/tests/configs.cc index 6ef0c766b..8d4c86918 100644 --- a/tests/configs.cc +++ b/tests/configs.cc @@ -2,7 +2,7 @@ #include "lib/proto.h" #include "lib/flags.h" #include "lib/core/bytes.h" -#include +#include "fmt/format.h" extern const std::map formats;