From 95042b9f5c2243e74d421eef4ff6c570092a5d68 Mon Sep 17 00:00:00 2001 From: Stan Date: Sun, 14 Aug 2022 18:22:48 +0000 Subject: [PATCH] Fix previous commit. git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@27056 3db68df2-c116-0410-a063-a993310a9797 --- source/ps/Mod.cpp | 3 +-- source/ps/ModInstaller.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/source/ps/Mod.cpp b/source/ps/Mod.cpp index efd5387bf9..38d4c4590c 100644 --- a/source/ps/Mod.cpp +++ b/source/ps/Mod.cpp @@ -35,7 +35,6 @@ #if !OS_WIN #include "lib/os_path.h" -#include "lib/path.h" #endif #include @@ -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); diff --git a/source/ps/ModInstaller.cpp b/source/ps/ModInstaller.cpp index 20d1e69baa..18182afeca 100644 --- a/source/ps/ModInstaller.cpp +++ b/source/ps/ModInstaller.cpp @@ -30,7 +30,6 @@ #if !OS_WIN #include "lib/os_path.h" -#include "lib/path.h" #endif #include @@ -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()) -- 2.11.4.GIT