X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=1205fb21b22e833b07acd6f98ed5c06a406fc84e;hb=89115db77729a2c99f1a09ff6a461720e16f889e;hp=bbe82aba682502ce359583351758de2fa5cc33ef;hpb=d31f8eef7952d645580e989ca4ed3fcfadaaa642;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index bbe82aba6..1205fb21b 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -6,6 +6,7 @@ import i18n
 sources = """
           about_dialog.cc
           audio_dialog.cc
+          audio_mapping_view.cc
           audio_plot.cc
           config_dialog.cc
           dci_metadata_dialog.cc
@@ -15,33 +16,30 @@ 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
           """
 
 def configure(conf):
-    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,
+    conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args='--cppflags --cxxflags --libs',
                    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.
-        extras = ['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']
-
-        for e in extras:
-            conf.env.STLIB_WXWIDGETS.append(e)
 
+    if conf.env.STATIC:
+	# wx-config returns its static libraries as full paths, without -l prefixes, which confuses
+        # check_cfg(), so just hard-code it all.
+        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.env.LIB_WXWIDGETS = ['tiff', 'SM']
+ 
     conf.in_msg = 1
     wx_version = conf.check_cfg(package='', path=conf.options.wx_config, args='--version').strip()
     conf.im_msg = 0
@@ -54,20 +52,20 @@ 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'
     if bld.env.TARGET_LINUX:
         obj.uselib += ' GTK'
-    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'), 'libdvdomatic-wx', bld)
+    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'wx'), sources, 'libdvdomatic-wx')
+    i18n.pot(os.path.join('src', 'wx'), sources, 'libdcpomatic-wx')
 
 def pot_merge(bld):
-    i18n.pot_merge(os.path.join('src', 'wx'), 'libdvdomatic-wx')
+    i18n.pot_merge(os.path.join('src', 'wx'), 'libdcpomatic-wx')