Only define UNICODE in src/lib/{cross_windows,util}.cc.

diff --git a/src/lib/cross_windows.cc b/src/lib/cross_windows.cc
index f778a60e15088d932d85cb33a2ed9620c09d91f0..486e9b5d588748cc56d738f035edfbdfd084103b 100644 (file)
--- 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 4ce677bf63a666b2fceacceb490eb297af7133ff..0646a478772a086704cfcb6b7e4d2d87408ab18c 100644 (file)
--- 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 bfc84112da9053ab54e48fd6ecee0cce4d550138..e2cf96938d16f4d934e419d83fc24cf7c7e50869 100644 (file)
--- 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')