diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-06-16 00:59:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-09-21 09:47:04 +0200 |
| commit | fc4c3e7f0a08d9e2350edb56fa76258114042960 (patch) | |
| tree | 8a9cb63c2a5c490faf4ac7f4622a296913f6862d | |
| parent | 7f641936b00ec87b6eea2ef0a5daa1b1710cf9f4 (diff) | |
Only define UNICODE in src/lib/{cross_windows,util}.cc.
| -rw-r--r-- | src/lib/cross_windows.cc | 2 | ||||
| -rw-r--r-- | src/lib/util.cc | 2 | ||||
| -rw-r--r-- | wscript | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc index f778a60e1..486e9b5d5 100644 --- a/src/lib/cross_windows.cc +++ b/src/lib/cross_windows.cc @@ -19,6 +19,8 @@ */ +#define UNICODE 1 + #include "cross.h" #include "compose.hpp" #include "log.h" diff --git a/src/lib/util.cc b/src/lib/util.cc index 4ce677bf6..0646a4787 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -22,6 +22,8 @@ * @brief Some utility functions and classes. */ +#define UNICODE 1 + #include "util.h" #include "exceptions.h" #include "dcp_content_type.h" @@ -151,7 +151,6 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_WINDOWS') conf.env.append_value('CXXFLAGS', '-DWIN32_LEAN_AND_MEAN') conf.env.append_value('CXXFLAGS', '-DBOOST_USE_WINDOWS_H') - conf.env.append_value('CXXFLAGS', '-DUNICODE') conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN') conf.env.append_value('CXXFLAGS', '-mfpmath=sse') conf.env.append_value('CXXFLAGS', '-Wcast-align') |