Mercurial > hg > orthanc
changeset 1494:a13581480b1f
fix mingw build
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 05 Aug 2015 10:07:53 +0200 |
| parents | 9a1c7293955b |
| children | fbe40117eb21 |
| files | Core/Logging.cpp Core/Toolbox.cpp Resources/CMake/LibIconvConfiguration.cmake |
| diffstat | 3 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/Logging.cpp Tue Aug 04 14:58:56 2015 +0200 +++ b/Core/Logging.cpp Wed Aug 05 10:07:53 2015 +0200 @@ -189,14 +189,12 @@ boost::filesystem::path log, link; GetLogPath(log, link, level, directory); - printf("[%s]\n", log.string().c_str()); - #if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__))) boost::filesystem::remove(link); boost::filesystem::create_symlink(log.filename(), link); #endif - file.reset(new std::ofstream(log.c_str())); + file.reset(new std::ofstream(log.string().c_str())); stream = file.get(); }
--- a/Core/Toolbox.cpp Tue Aug 04 14:58:56 2015 +0200 +++ b/Core/Toolbox.cpp Wed Aug 05 10:07:53 2015 +0200 @@ -437,7 +437,7 @@ { return static_cast<uint64_t>(boost::filesystem::file_size(path)); } - catch (boost::filesystem::filesystem_error) + catch (boost::filesystem::filesystem_error&) { throw OrthancException(ErrorCode_InexistentFile); }
--- a/Resources/CMake/LibIconvConfiguration.cmake Tue Aug 04 14:58:56 2015 +0200 +++ b/Resources/CMake/LibIconvConfiguration.cmake Wed Aug 05 10:07:53 2015 +0200 @@ -35,6 +35,9 @@ unset(EILSEQ) unset(HAVE_WCHAR_T) +# Create an empty "config.h" for libiconv +file(WRITE ${LIBICONV_SOURCES_DIR}/include/config.h "") + include_directories( ${LIBICONV_SOURCES_DIR}/include )