diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-02-03 09:16:05 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-11-23 23:31:38 +0100 |
| commit | 3f91b7bdb1232df77349f33b82f18b535e99c505 (patch) | |
| tree | 614facba0dbda9aa3410b3f85340337e7e896dbf /src | |
| parent | 6ad57df31007ba3329d2a5c1e97eb8e29558c7be (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 61f58d0..b3adc34 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 56b6c5b..52ec449 100644 --- a/src/wscript +++ b/src/wscript @@ -38,7 +38,7 @@ def build(bld): obj.name = 'libasdcp-carl' obj.target = 'asdcp-carl' - obj.uselib = 'OPENSSL' + obj.uselib = 'OPENSSL BOOST_FILESYSTEM' obj.use = 'libkumu-carl' obj.includes = ['.'] obj.export_includes = ['.'] |