gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 18:22:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove <filesystem>

Browse Source 
Should fix compilation with GCC before 9
This commit is contained in:
ISSOtm
2022-03-09 09:35:46 +01:00
committed by Eldred Habert
parent 8d00a61602
commit c4361b965c
4 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/gfx/main.cpp
View File

@@ -11,7 +11,6 @@
#include <algorithm>
#include <assert.h>
#include <charconv>
#include <filesystem>
#include <inttypes.h>
#include <limits>
#include <stdarg.h>
@@ -26,6 +25,8 @@
#include "gfx/convert.hpp"
using namespace std::literals::string_view_literals;
Options options;
static uintmax_t nbErrors;
@@ -287,10 +288,25 @@ int main(int argc, char *argv[]) {
options.input = argv[argc - 1];
auto autoOutPath = [](bool autoOptEnabled, std::filesystem::path &path, char const *extension) {
auto autoOutPath = [](bool autoOptEnabled, std::string &path, char const *extension) {
if (autoOptEnabled) {
path = options.input;
path.replace_extension(extension);
constexpr std::string_view chars =
// Both must start with a dot!
#if defined(_MSC_VER) || defined(__MINGW32__)
"./\\"sv;
#else
"./"sv;
#endif
size_t i = options.input.find_last_of(chars);
if (i != options.input.npos && options.input[i] == '.') {
// We found the last dot, but check if it's part of a stem
// (There must be a non-path separator character before it)
if (i != 0 && chars.find(options.input[i - 1], 1) == chars.npos) {
// We can replace the extension
path.resize(i + 1); // Keep the dot, though
path.append(extension);
}
}
}
};
autoOutPath(autoAttrmap, options.attrmap, ".attrmap");
@@ -337,15 +353,9 @@ int main(int argc, char *argv[]) {
options.baseTileIDs[1]);
fprintf(stderr, "\tMaximum %" PRIu16 " tiles in bank 0, %" PRIu16 " in bank 1\n",
options.maxNbTiles[0], options.maxNbTiles[1]);
auto printPath = [](char const *name, std::filesystem::path const &path) {
auto printPath = [](char const *name, std::string const &path) {
if (!path.empty()) {
#ifdef _MSC_VER
#define PRIpath "ls"
#else
#define PRIpath "s"
#endif
fprintf(stderr, "\t%s: %" PRIpath "\n", name, path.c_str());
#undef PRIpath
fprintf(stderr, "\t%s: %s\n", name, path.c_str());
}
};
printPath("Input image", options.input);