diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-11-20 11:04:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-11-30 00:42:42 +0100 |
| commit | f98dbc3a2d320a38e0902d280752f21a69d5f9cc (patch) | |
| tree | 2d8cb4886a67abfb1f5bbde348244825296bd750 | |
| parent | b990d213cd75982eadee5a9c1e1f20792c1c6743 (diff) | |
Define UNICODE (and _UNICODE) in the wscript on Windows.
| -rw-r--r-- | src/lib/cross_windows.cc | 2 | ||||
| -rw-r--r-- | src/lib/i18n_setup_windows.cc | 3 | ||||
| -rw-r--r-- | src/lib/util.cc | 3 | ||||
| -rw-r--r-- | wscript | 2 |
4 files changed, 2 insertions, 8 deletions
diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc index 2076f3928..452e083b6 100644 --- a/src/lib/cross_windows.cc +++ b/src/lib/cross_windows.cc @@ -19,8 +19,6 @@ */ -#define UNICODE 1 - #include "cross.h" #include "log.h" #include "dcpomatic_log.h" diff --git a/src/lib/i18n_setup_windows.cc b/src/lib/i18n_setup_windows.cc index 7833972b6..2aaf44341 100644 --- a/src/lib/i18n_setup_windows.cc +++ b/src/lib/i18n_setup_windows.cc @@ -19,9 +19,6 @@ */ -#define UNICODE 1 - - #include "i18n_setup.h" #include <fmt/format.h> #include <boost/filesystem.hpp> diff --git a/src/lib/util.cc b/src/lib/util.cc index a44e006ae..7f3f6ce81 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -23,9 +23,6 @@ */ -#define UNICODE 1 - - #include "audio_buffers.h" #include "audio_processor.h" #include "cinema_sound_processor.h" @@ -212,6 +212,8 @@ def configure(conf): conf.env.append_value('CXXFLAGS', '-DBOOST_USE_WINDOWS_H') conf.env.append_value('CXXFLAGS', '-DBOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN') conf.env.append_value('CXXFLAGS', '-Wcast-align') + conf.env.append_value('CXXFLAGS', '-DUNICODE=1') + conf.env.append_value('CXXFLAGS', '-D_UNICODE=1') wxrc = os.popen('wx-config --rescomp').read().split()[1:] conf.env.append_value('WINRCFLAGS', wxrc) if conf.options.enable_debug: |