X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=wscript;h=678aa0a0beaedc47a8fd2400fafe0b73b7db25e5;hb=4ab5eefd44f045efcd6c03924441b4218a956fdd;hp=290f00188312bfc4fbb8b4943bcd0b298501d620;hpb=650d80e5daf50330ec449ea22a51c3dffa684598;p=dcpomatic.git

diff --git a/wscript b/wscript
index 290f00188..678aa0a0b 100644
--- a/wscript
+++ b/wscript
@@ -1,12 +1,14 @@
 import subprocess
 import os
+import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.30pre'
+VERSION = '0.33'
 
 def options(opt):
     opt.load('compiler_cxx')
     opt.load('winres')
+
     opt.add_option('--debug-hash', action='store_true', default = False, help = 'print hashes of data at various points')
     opt.add_option('--enable-debug', action='store_true', default = False, help = 'build with debugging information and without optimisation')
     opt.add_option('--disable-gui', action='store_true', default = False, help = 'disable building of GUI tools')
@@ -16,14 +18,14 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
-    conf.load('winres')
+    if conf.options.target_windows:
+        conf.load('winres')
 
     conf.env.append_value('CXXFLAGS', ['-D__STDC_CONSTANT_MACROS', '-msse', '-mfpmath=sse', '-ffast-math', '-fno-strict-aliasing', '-Wall', '-Wno-attributes'])
     conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_VERSION="%s"' % VERSION])
 
     if conf.options.target_windows:
-        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS'])
-        conf.env.append_value('LINKFLAGS', '-mwindows')
+        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN'])
         conf.options.disable_player = True
         conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2")
         boost_lib_suffix = '-mt'
@@ -56,6 +58,7 @@ def configure(conf):
     conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
     conf.check_cfg(package = 'libavutil', args = '--cflags --libs', uselib_store = 'AVUTIL', mandatory = True)
     conf.check_cfg(package = 'libswscale', args = '--cflags --libs', uselib_store = 'SWSCALE', mandatory = True)
+    conf.check_cfg(package = 'libswresample', args = '--cflags --libs', uselib_store = 'SWRESAMPLE', mandatory = True)
     conf.check_cfg(package = 'libpostproc', args = '--cflags --libs', uselib_store = 'POSTPROC', mandatory = True)
     conf.check_cfg(package = 'sndfile', args = '--cflags --libs', uselib_store = 'SNDFILE', mandatory = True)
     conf.check_cfg(package = 'libdcp', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
@@ -125,7 +128,7 @@ def build(bld):
         bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
 
 def dist(ctx):
-    ctx.excl = 'TODO core *~ src/gtk/*~ src/lib/*~ .waf* build .git'
+    ctx.excl = 'TODO core *~ src/wx/*~ src/lib/*~ .waf* build .git deps alignment hacks sync'
 
 def create_version_cc(version):
     if os.path.exists('.git'):