X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fwscript;h=019362e9fecafccd75a4bb9b78217875821e3153;hb=c63530f69224f0867837591e106bea71cb89ef1e;hp=95cdbc8f02b5b779f83f8fb3dbaf7cb31111750c;hpb=bc5df5cc9c2b11524938281f1b2043b185373020;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index 95cdbc8f0..019362e9f 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -4,6 +4,9 @@ from waflib import Logs
 import i18n
 
 sources = """
+          about_dialog.cc
+          audio_dialog.cc
+          audio_plot.cc
           config_dialog.cc
           dci_metadata_dialog.cc
           dir_picker_ctrl.cc
@@ -22,7 +25,25 @@ sources = """
           """
 
 def configure(conf):
-    conf.check_cfg(package = '', path = conf.options.wx_config, args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
+    wx_args = '--cppflags --cxxflags --libs'
+    if conf.env.STATIC:
+        wx_args += ' --static'
+
+    conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args=wx_args,
+                   uselib_store='WXWIDGETS', mandatory=True)
+ 
+    if conf.env.STATIC:
+        # wx-config returns its static libraries as full paths, without -l prefixes, which I think confuses
+        # check_cfg(), so it ends up putting these libraries before even the .cc file when linking.
+        # This hack works around that.
+        conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_xrc-2.9', 'wx_gtk2u_qa-2.9', 'wx_baseu_net-2.9', 'wx_gtk2u_html-2.9',
+                                    'wx_gtk2u_adv-2.9', 'wx_gtk2u_core-2.9', 'wx_baseu_xml-2.9', 'wx_baseu-2.9']
+
+    conf.in_msg = 1
+    wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
+    conf.im_msg = 0
+    if wx_version != '2.9.4':
+        conf.fatal('wxwidgets version 2.9.4 is required; %s found' % wx_version)
 
 def build(bld):
     if bld.env.STATIC:
@@ -34,19 +55,16 @@ def build(bld):
     obj.includes = [ '..' ]
     obj.export_includes = ['.']
     obj.uselib = 'WXWIDGETS'
+    if bld.env.TARGET_LINUX:
+        obj.uselib += ' GTK'
     obj.use = 'libdvdomatic'
     obj.source = sources
     obj.target = 'dvdomatic-wx'
 
-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.po_to_mo(os.path.join('src', 'wx'), 'libdvdomatic-wx', bld)
 
-    os.system('xgettext -d libdvdomatic-wx -s --keyword=_ -p build/src/wx -o libdvdomatic-wx.pot %s' % s)
-
-def mo(bld):
-    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdvdomatic-wx')
+def pot(bld):
+    i18n.pot(os.path.join('src', 'wx'), sources, 'libdvdomatic-wx')
 
+def pot_merge(bld):
+    i18n.pot_merge(os.path.join('src', 'wx'), 'libdvdomatic-wx')