Tweaks.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index 60b167ff8c95017a7adc1e5ef6ad3f66b1041a6f..cea13416dcecf1f4b3de1b8b890e358b4ce8d675 100644 (file)
--- a/wscript
+++ b/wscript
@@ -1,11 +1,14 @@
 import subprocess
 import os
+import sys
 
 APPNAME = 'dvdomatic'
-VERSION = '0.30pre'
+VERSION = '0.33pre'
 
 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')
@@ -15,12 +18,14 @@ def options(opt):
 
 def configure(conf):
     conf.load('compiler_cxx')
+    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('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'
@@ -34,6 +39,7 @@ def configure(conf):
     conf.env.TARGET_WINDOWS = conf.options.target_windows
     conf.env.DISABLE_GUI = conf.options.disable_gui
     conf.env.DISABLE_PLAYER = conf.options.disable_player
+    conf.env.VERSION = VERSION
 
     if conf.options.disable_player:
         conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_DISABLE_PLAYER')
@@ -52,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)
@@ -106,6 +113,8 @@ def build(bld):
 
     bld.recurse('src')
     bld.recurse('test')
+    if bld.env.TARGET_WINDOWS:
+        bld.recurse('windows')
 
     d = { 'PREFIX' : '${PREFIX' }
 
@@ -119,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'):
@@ -141,3 +150,4 @@ def create_version_cc(version):
     except IOError:
         print('Could not open src/lib/version.cc for writing\n')
         sys.exit(-1)
+