diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-03 09:16:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-12-03 17:01:32 +0100 |
| commit | c6a91f5fa9faf97ca7d7da750657d88f6980345c (patch) | |
| tree | ecd8746f4b6d518bac2fe04a92744ba460939d9c /src | |
| parent | 4b03c8f8d296074bc5984281dd6bc5e5180f7b2c (diff) | |
Win32 build fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/KM_fileio.cpp | 15 | ||||
| -rw-r--r-- | src/wscript | 2 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/KM_fileio.cpp b/src/KM_fileio.cpp index 33e354d..60c50a0 100644 --- a/src/KM_fileio.cpp +++ b/src/KM_fileio.cpp @@ -804,9 +804,9 @@ Kumu::FileReader::OpenRead(const std::string& filename) const // suppress popup window on error UINT prev = ::SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); - int const wn = MultiByteToWideChar (CP_UTF8, 0, filename, -1, 0, 0); + int const wn = MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, 0, 0); wchar_t* buffer = new wchar_t[wn]; - if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn) == 0) + if (MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, buffer, wn) == 0) { delete[] buffer; return Kumu::RESULT_FAIL; @@ -937,9 +937,9 @@ Kumu::FileWriter::OpenWrite(const std::string& filename) // suppress popup window on error UINT prev = ::SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); - int const wn = MultiByteToWideChar (CP_UTF8, 0, filename, -1, 0, 0); + int const wn = MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, 0, 0); wchar_t* buffer = new wchar_t[wn]; - if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn) == 0) + if (MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, buffer, wn) == 0) { delete[] buffer; return Kumu::RESULT_FAIL; @@ -967,17 +967,16 @@ Kumu::FileWriter::OpenWrite(const std::string& filename) /** @param filename File name (UTF-8 encoded) */ Kumu::Result_t -Kumu::FileWriter::OpenModify(const char* filename) +Kumu::FileWriter::OpenModify(const std::string& filename) { - KM_TEST_NULL_STR_L(filename); m_Filename = filename; // suppress popup window on error UINT prev = ::SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOOPENFILEERRORBOX); - int const wn = MultiByteToWideChar (CP_UTF8, 0, filename, -1, 0, 0); + int const wn = MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, 0, 0); wchar_t* buffer = new wchar_t[wn]; - if (MultiByteToWideChar (CP_UTF8, 0, filename, -1, buffer, wn) == 0) { + if (MultiByteToWideChar (CP_UTF8, 0, filename.c_str(), -1, buffer, wn) == 0) { delete[] buffer; return Kumu::RESULT_FAIL; } diff --git a/src/wscript b/src/wscript index c60dd16..42de573 100644 --- a/src/wscript +++ b/src/wscript @@ -34,7 +34,7 @@ def build(bld): obj.name = 'libasdcp-cth' obj.target = 'asdcp-cth' - obj.uselib = 'OPENSSL' + obj.uselib = 'OPENSSL BOOST_FILESYSTEM' obj.use = 'libkumu-cth' obj.includes = ['.'] obj.export_includes = ['.'] |