Fix merge.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index ca3ef27378c36a22ae0cfd13f81f4476265ee495..02d95715b719e8d8c174caf92adac21b3929a601 100644 (file)
--- a/wscript
+++ b/wscript
@@ -3,7 +3,7 @@ import os
 import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.64pre'
+VERSION = '0.68pre'
 
 def options(opt):
     opt.load('compiler_cxx')
@@ -22,7 +22,7 @@ def configure(conf):
     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes'])
 
     if conf.options.target_windows:
-        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H'])
+        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
         wxrc = os.popen('wx-config --rescomp').read().split()[1:]
         print wxrc
         conf.env.append_value('WINRCFLAGS', wxrc)
@@ -61,7 +61,7 @@ def configure(conf):
         conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True)
     else:
         # This is hackio grotesquio for static builds (ie for .deb packages).  We need to link some things
-        # statically and some dynamically, or things get horribly confused the dynamic linker (I think)
+        # statically and some dynamically, or things get horribly confused and the dynamic linker (I think)
         # crashes horribly.  These calls do what the check_cfg calls would have done, but specify the
         # different bits as static or dynamic as required.  It'll break if you look at it funny, but
         # I think anyone else who builds would do so dynamically.
@@ -84,6 +84,10 @@ def configure(conf):
         conf.env.HAVE_POSTPROC = 1
         conf.env.STLIB_POSTPROC = ['postproc']
 
+        # This doesn't seem to be set up, and we need it otherwise resampling support
+        # won't be included.  Hack upon a hack, obviously
+        conf.env.append_value('CXXFLAGS', ['-DHAVE_SWRESAMPLE=1'])
+
     conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
     conf.check_cfg(package = 'glib-2.0', args = '--cflags --libs', uselib_store = 'GLIB', mandatory = True)
     conf.check_cfg(package = '', path = 'Magick++-config', args = '--cppflags --cxxflags --libs', uselib_store = 'MAGICK', mandatory = True)