1
1
forked from 0ad/0ad

Fix previous commit.

This was SVN commit r27056.
This commit is contained in:
Stan 2022-08-14 18:22:48 +00:00
parent c9dc8676a6
commit ab16e60afa
2 changed files with 2 additions and 4 deletions

View File

@ -35,7 +35,6 @@
#if !OS_WIN
#include "lib/os_path.h"
#include "lib/path.h"
#endif
#include <algorithm>
@ -60,7 +59,7 @@ bool LoadModJSON(const PIVFS& vfs, OsPath modsPath, OsPath mod, std::string& tex
#if OS_WIN
const std::filesystem::path modJsonPath = (modsPath / mod / L"mod.json").fileSystemPath();
#else
const Path::String modJsonPath = OsString(modsPath / mod / L"mod.json").c_str();
const char* modJsonPath = OsString(modsPath / mod / L"mod.json").c_str();
#endif
// Attempt to open mod.json first.
std::ifstream modjson(modJsonPath);

View File

@ -30,7 +30,6 @@
#if !OS_WIN
#include "lib/os_path.h"
#include "lib/path.h"
#endif
#include <fstream>
@ -119,7 +118,7 @@ CModInstaller::ModInstallationResult CModInstaller::Install(
#if OS_WIN
const std::filesystem::path modJsonPath = (modDir / L"mod.json").fileSystemPath();
#else
const Path::String modJsonPath = OsString(modDir / L"mod.json").c_str();
const char* modJsonPath = OsString(modDir / L"mod.json").c_str();
#endif
std::ofstream mod_json(modJsonPath);
if (mod_json.good())