Tweaks.

[dcpomatic.git] / wscript

diff --git a/wscript b/wscript
index c2db55e7eb2cbeb860e75ccc64858915f8119577..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,21 +18,28 @@ 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'
+        boost_thread = 'boost_thread_win32-mt'
     else:
         conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX')
+        boost_lib_suffix = ''
+        boost_thread = 'boost_thread'
 
     conf.env.DEBUG_HASH = conf.options.debug_hash
     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')
@@ -48,9 +58,11 @@ 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)
+    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)
     conf.check_cc(msg = 'Checking for library libtiff', function_name = 'TIFFOpen', header_name = 'tiffio.h', lib = 'tiff', uselib_store = 'TIFF')
     conf.check_cc(fragment  = """
@@ -69,23 +81,27 @@ def configure(conf):
                               return 0;\n
                               }
                               """, msg = 'Checking for library libssh', mandatory = False, lib = 'ssh', uselib_store = 'SSH')
-                             
+
     conf.check_cxx(fragment = """
                              #include <boost/thread.hpp>\n
                              int main() { boost::thread t (); }\n
                              """, msg = 'Checking for boost threading library',
-                              lib = ['boost_thread_win32-mt', 'boost_system-mt'], uselib_store = 'BOOST_THREAD')
+                              lib = [boost_thread, 'boost_system%s' % boost_lib_suffix],
+                              uselib_store = 'BOOST_THREAD')
+
     conf.check_cxx(fragment = """
                              #include <boost/filesystem.hpp>\n
                              int main() { boost::filesystem::copy_file ("a", "b"); }\n
                              """, msg = 'Checking for boost filesystem library',
-                              libpath = '/usr/local/lib', lib = ['boost_filesystem-mt', 'boost_system-mt'], uselib_store = 'BOOST_FILESYSTEM')
+                              libpath = '/usr/local/lib',
+                              lib = ['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix],
+                              uselib_store = 'BOOST_FILESYSTEM')
 
     conf.check_cc(fragment = """
                              #include <glib.h>
                              int main() { g_format_size (1); }
                              """, msg = 'Checking for g_format_size ()',
-                             lib = 'glib',
+                             uselib = 'GLIB',
                              define_name = 'HAVE_G_FORMAT_SIZE',
                              mandatory = False)
 
@@ -97,6 +113,8 @@ def build(bld):
 
     bld.recurse('src')
     bld.recurse('test')
+    if bld.env.TARGET_WINDOWS:
+        bld.recurse('windows')
 
     d = { 'PREFIX' : '${PREFIX' }
 
@@ -110,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'):
@@ -132,3 +150,4 @@ def create_version_cc(version):
     except IOError:
         print('Could not open src/lib/version.cc for writing\n')
         sys.exit(-1)
+