1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-21 05:39:42 +00:00

Merge branch 'noboost_essimporter' into 'master'

Remove boost::filesystem from essimporter

See merge request OpenMW/openmw!1913
This commit is contained in:
psi29a 2022-05-24 07:57:37 +00:00
commit 09757d0b87
2 changed files with 2 additions and 4 deletions

View file

@ -36,7 +36,6 @@ openmw_add_executable(openmw-essimporter
target_link_libraries(openmw-essimporter
${Boost_PROGRAM_OPTIONS_LIBRARY}
${Boost_FILESYSTEM_LIBRARY}
components
)

View file

@ -1,14 +1,13 @@
#include <iostream>
#include <filesystem>
#include <boost/program_options.hpp>
#include <boost/filesystem.hpp>
#include <components/files/configurationmanager.hpp>
#include "importer.hpp"
namespace bpo = boost::program_options;
namespace bfs = boost::filesystem;
int main(int argc, char** argv)
@ -57,7 +56,7 @@ int main(int argc, char** argv)
else
{
const std::string& ext = ".omwsave";
if (bfs::exists(bfs::path(outputFile))
if (std::filesystem::exists(std::filesystem::path(outputFile))
&& (outputFile.size() < ext.size() || outputFile.substr(outputFile.size()-ext.size()) != ext))
{
throw std::runtime_error("Output file already exists and does not end in .omwsave. Did you mean to use --compare?");