Merge master.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index ef1d1c083f225fc20ba442c09a062cbd03ac2c43..992f31175eb0e27cfb36ed1209f7c411d53567a8 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -1,6 +1,13 @@
 import os
+import glob
+from waflib import Logs
+import i18n
 
 sources = """
+          about_dialog.cc
+          audio_dialog.cc
+          audio_mapping_view.cc
+          audio_plot.cc
           config_dialog.cc
           dci_metadata_dialog.cc
           dir_picker_ctrl.cc
@@ -9,11 +16,15 @@ sources = """
           filter_dialog.cc
           filter_view.cc
           gain_calculator_dialog.cc
+          imagemagick_content_dialog.cc
           job_manager_view.cc
           job_wrapper.cc
           new_film_dialog.cc
           properties_dialog.cc
           server_dialog.cc
+          timecode.cc
+          timeline.cc
+          timeline_dialog.cc
           wx_util.cc
           wx_ui_signaller.cc
           """
@@ -27,19 +38,18 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name   = 'libdvdomatic-wx'
+    obj.name   = 'libdcpomatic-wx'
     obj.includes = [ '..' ]
     obj.export_includes = ['.']
     obj.uselib = 'WXWIDGETS'
-    obj.use = 'libdvdomatic'
+    obj.use = 'libdcpomatic'
     obj.source = sources
-    obj.target = 'dvdomatic-wx'
+    obj.target = 'dcpomatic-wx'
+
+    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld)
 
 def pot(bld):
-    s = ""
-    for f in sources.split('\n'):
-        t = f.strip()
-        if len(t) > 0:
-            s += (os.path.join('src', 'wx', t)) + " "
+    i18n.pot(os.path.join('src', 'wx'), sources, 'libdcpomatic-wx')
 
-    os.system('xgettext -d libdvdomatic -s --keyword=_ -p build/src/wx -o libdvdomatic-wx.pot %s' % s)
+def pot_merge(bld):
+    i18n.pot_merge(os.path.join('src', 'wx'), 'libdcpomatic-wx')