diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-11-20 11:04:40 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-12-29 00:10:23 +0100 |
| commit | e72f3988b00b027e77abb642c4fd27a603818251 (patch) | |
| tree | 2d5ac16df751a9911adbecfcb4cff83c8e23aae9 | |
| parent | b979cb8bdf5b2f89b19327cfea65387be733f8ca (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 b173d2d61..f9f8aa7be 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: |