From fc4c3e7f0a08d9e2350edb56fa76258114042960 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 16 Jun 2021 00:59:19 +0200 Subject: [PATCH] Only define UNICODE in src/lib/{cross_windows,util}.cc. --- src/lib/cross_windows.cc | 2 ++ src/lib/util.cc | 2 ++ wscript | 1 - 3 files changed, 4 insertions(+), 1 deletion(-) 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" diff --git a/wscript b/wscript index bfc84112d..e2cf96938 100644 --- a/wscript +++ b/wscript @@ -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') -- 2.30.2