Browse Source

[dynarmic, qt] fix build with QuaZip <=1.4 and fmt v9

Signed-off-by: crueter <crueter@eden-emu.dev>
pull/2755/head
crueter 5 months ago
parent
commit
5518669a03
No known key found for this signature in database GPG Key ID: 425ACD2D4830EBC6
  1. 8
      src/dynarmic/src/dynarmic/ir/opcodes.h
  2. 15
      src/qt_common/util/compress.cpp

8
src/dynarmic/src/dynarmic/ir/opcodes.h

@ -654,11 +654,3 @@ constexpr bool MayGetNZCVFromOp(const Opcode op) noexcept {
}
} // namespace Dynarmic::IR
template<>
struct fmt::formatter<Dynarmic::IR::Opcode> : fmt::formatter<std::string> {
template<typename FormatContext>
auto format(Dynarmic::IR::Opcode op, FormatContext& ctx) const {
return formatter<std::string>::format(Dynarmic::IR::GetNameOf(op), ctx);
}
};

15
src/qt_common/util/compress.cpp

@ -82,16 +82,9 @@ bool compressSubDir(QuaZip *zip,
if (dir != origDir) {
QuaZipFile dirZipFile(zip);
std::unique_ptr<QuaZipNewInfo> qzni;
if (options.getDateTime().isNull()) {
qzni = std::make_unique<QuaZipNewInfo>(origDirectory.relativeFilePath(dir)
+ QLatin1String("/"),
dir);
} else {
qzni = std::make_unique<QuaZipNewInfo>(origDirectory.relativeFilePath(dir)
+ QLatin1String("/"),
dir,
options.getDateTime());
}
qzni = std::make_unique<QuaZipNewInfo>(origDirectory.relativeFilePath(dir)
+ QLatin1String("/"),
dir);
if (!dirZipFile.open(QIODevice::WriteOnly, *qzni, nullptr, 0, 0)) {
return false;
}
@ -156,7 +149,7 @@ bool compressFile(QuaZip *zip,
return false;
} else {
if (!outFile.open(QIODevice::WriteOnly,
QuaZipNewInfo(fileDest, fileName, options.getDateTime()),
QuaZipNewInfo(fileDest, fileName),
nullptr,
0,
options.getCompressionMethod(),

Loading…
Cancel
Save