X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=wscript;h=5288cab14141bce30f51ff60e979ddcf5dd7f3dc;hp=a9a0573670e3ac7b0e95fdac531f11429f01e096;hb=47f25009bcbc765e397bcb471dd361a511c99daf;hpb=e8d8a27c7f6861b031b3250b0ad50d04c41a7721

diff --git a/wscript b/wscript
index a9a057367..5288cab14 100644
--- a/wscript
+++ b/wscript
@@ -2,7 +2,7 @@ import subprocess
 import os
 import sys
 
-APPNAME = 'dvdomatic'
+APPNAME = 'dcpomatic'
 VERSION = '0.85pre'
 
 def options(opt):
@@ -25,7 +25,7 @@ def configure(conf):
                                        '-Wall', '-Wno-attributes', '-Wextra'])
 
     if conf.options.target_windows:
-        conf.env.append_value('CXXFLAGS', ['-DDVDOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
+        conf.env.append_value('CXXFLAGS', ['-DDCPOMATIC_WINDOWS', '-DWIN32_LEAN_AND_MEAN', '-DBOOST_USE_WINDOWS_H', '-DUNICODE'])
         wxrc = os.popen('wx-config --rescomp').read().split()[1:]
         conf.env.append_value('WINRCFLAGS', wxrc)
         if conf.options.enable_debug:
@@ -35,9 +35,9 @@ def configure(conf):
         boost_lib_suffix = '-mt'
         boost_thread = 'boost_thread_win32-mt'
     else:
-        conf.env.append_value('CXXFLAGS', '-DDVDOMATIC_POSIX')
+        conf.env.append_value('CXXFLAGS', '-DDCPOMATIC_POSIX')
         conf.env.append_value('CXXFLAGS', '-DPOSIX_LOCALE_PREFIX="%s/share/locale"' % conf.env['PREFIX'])
-        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dvdomatic"' % conf.env['PREFIX'])
+        conf.env.append_value('CXXFLAGS', '-DPOSIX_ICON_PREFIX="%s/share/dcpomatic"' % conf.env['PREFIX'])
         boost_lib_suffix = ''
         boost_thread = 'boost_thread'
         conf.env.append_value('LINKFLAGS', '-pthread')
@@ -50,12 +50,13 @@ def configure(conf):
     conf.env.VERSION = VERSION
 
     if conf.options.enable_debug:
-        conf.env.append_value('CXXFLAGS', ['-g', '-DDVDOMATIC_DEBUG'])
+        conf.env.append_value('CXXFLAGS', ['-g', '-DDCPOMATIC_DEBUG'])
     else:
         conf.env.append_value('CXXFLAGS', '-O2')
 
     if not conf.options.static:
         conf.check_cfg(package = 'libdcp', atleast_version = '0.45', args = '--cflags --libs', uselib_store = 'DCP', mandatory = True)
+        conf.check_cfg(package = 'libcxml', atleast_version = '0.01', args = '--cflags --libs', uselib_store = 'CXML', mandatory = True)
         conf.check_cfg(package = 'libavformat', args = '--cflags --libs', uselib_store = 'AVFORMAT', mandatory = True)
         conf.check_cfg(package = 'libavfilter', args = '--cflags --libs', uselib_store = 'AVFILTER', mandatory = True)
         conf.check_cfg(package = 'libavcodec', args = '--cflags --libs', uselib_store = 'AVCODEC', mandatory = True)
@@ -72,6 +73,9 @@ def configure(conf):
         conf.env.HAVE_DCP = 1
         conf.env.STLIB_DCP = ['dcp', 'asdcp-libdcp', 'kumu-libdcp']
         conf.env.LIB_DCP = ['glibmm-2.4', 'xml++-2.6', 'ssl', 'crypto', 'bz2']
+        conf.env.HAVE_CXML = 1
+        conf.env.STLIB_CXML = ['cxml']
+        conf.check_cfg(package = 'libxml++-2.6', args = '--cflags --libs', uselib_store = 'XML++', mandatory = True)
         conf.env.HAVE_AVFORMAT = 1
         conf.env.STLIB_AVFORMAT = ['avformat']
         conf.env.HAVE_AVFILTER = 1
@@ -224,16 +228,16 @@ def build(bld):
     d = { 'PREFIX' : '${PREFIX' }
 
     obj = bld(features = 'subst')
-    obj.source = 'dvdomatic.desktop.in'
-    obj.target = 'dvdomatic.desktop'
+    obj.source = 'dcpomatic.desktop.in'
+    obj.target = 'dcpomatic.desktop'
     obj.dict = d
 
-    bld.install_files('${PREFIX}/share/applications', 'dvdomatic.desktop')
+    bld.install_files('${PREFIX}/share/applications', 'dcpomatic.desktop')
     for r in ['22x22', '32x32', '48x48', '64x64', '128x128']:
-        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dvdomatic.png' % r)
+        bld.install_files('${PREFIX}/share/icons/hicolor/%s/apps' % r, 'icons/%s/dcpomatic.png' % r)
 
     if not bld.env.TARGET_WINDOWS:
-        bld.install_files('${PREFIX}/share/dvdomatic', 'icons/taskbar_icon.png')
+        bld.install_files('${PREFIX}/share/dcpomatic', 'icons/taskbar_icon.png')
 
     bld.add_post_fun(post)
 
@@ -255,8 +259,8 @@ def create_version_cc(version):
 
     try:
         text =  '#include "version.h"\n'
-        text += 'char const * dvdomatic_git_commit = \"%s\";\n' % commit
-        text += 'char const * dvdomatic_version = \"%s\";\n' % version
+        text += 'char const * dcpomatic_git_commit = \"%s\";\n' % commit
+        text += 'char const * dcpomatic_version = \"%s\";\n' % version
         print('Writing version information to src/lib/version.cc')
         o = open('src/lib/version.cc', 'w')
         o.write(text)