X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=8801ccc75556c090b05876d91bd94743a1c88c02;hb=cb990adba9c57e5107ef2aa9716cf0a26c1df83d;hp=18eb46f82aed6b619f2f785cf4a7897a3344b233;hpb=11c54ca7ffb9f4b70dff6414b8da2099597b0d4d;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index 18eb46f82..8801ccc75 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -6,30 +6,48 @@ import i18n
 sources = """
           about_dialog.cc
           audio_dialog.cc
+          audio_gain_dialog.cc
           audio_mapping_view.cc
           audio_panel.cc
           audio_plot.cc
+          cinema_dialog.cc
+          colour_conversion_editor.cc
           config_dialog.cc
+          content_colour_conversion_dialog.cc
           content_menu.cc
-          dci_metadata_dialog.cc
+          content_panel.cc
+          content_sub_panel.cc
+          dcp_panel.cc
+          isdcf_metadata_dialog.cc
           dir_picker_ctrl.cc
+          dolby_certificate_dialog.cc
+          doremi_certificate_dialog.cc
+          download_certificate_dialog.cc
           film_editor.cc
-          film_editor_panel.cc
           film_viewer.cc
           filter_dialog.cc
-          filter_view.cc
+          filter_editor.cc
           gain_calculator_dialog.cc
+          hints_dialog.cc
           job_manager_view.cc
           job_wrapper.cc
+          kdm_dialog.cc
+          make_signer_chain_dialog.cc
           new_film_dialog.cc
+          preset_colour_conversion_dialog.cc
           properties_dialog.cc
           repeat_dialog.cc
+          screen_dialog.cc
           server_dialog.cc
+          servers_list_dialog.cc
           subtitle_panel.cc
+          subtitle_view.cc
+          table_dialog.cc
           timecode.cc
           timeline.cc
           timeline_dialog.cc
           timing_panel.cc
+          update_dialog.cc
           video_panel.cc
           wx_util.cc
           wx_ui_signaller.cc
@@ -37,45 +55,50 @@ sources = """
 
 def configure(conf):
     args = '--cppflags --cxxflags'
-    if not conf.env.STATIC:
-        args += ' --libs'
+    if not conf.env.BUILD_STATIC:
+        args += ' --libs std,richtext'
 
     conf.check_cfg(msg='Checking for wxWidgets', package='', path=conf.options.wx_config, args=args,
                    uselib_store='WXWIDGETS', mandatory=True)
 
-    if conf.env.STATIC:
+    if conf.env.BUILD_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', 'dl', 'jpeg', 'png', 'X11']
+        conf.env.STLIB_WXWIDGETS = ['wx_gtk2u_richtext-3.0', 'wx_gtk2u_xrc-3.0', 'wx_gtk2u_qa-3.0', 'wx_baseu_net-3.0', 'wx_gtk2u_html-3.0',
+                                    'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0']
+        conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat']
+        if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE:
+            conf.env.LIB_WXWIDGETS.append('Xext')
+            conf.env.LIB_WXWIDGETS.append('X11')
+
+        if conf.env.TARGET_CENTOS_7:
+            conf.env.LIB_WXWIDGETS.append('Xxf86vm')
  
     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)
+    if not wx_version.startswith('3.0.'):
+        conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
 
 def build(bld):
-    if bld.env.STATIC:
+    if bld.env.BUILD_STATIC:
         obj = bld(features = 'cxx cxxstlib')
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name   = 'libdcpomatic-wx'
-#    obj.includes = [ '..' ]
+    obj.name   = 'libdcpomatic2-wx'
     obj.export_includes = ['..']
-    obj.uselib = 'WXWIDGETS'
+    obj.uselib = 'WXWIDGETS DCP'
     if bld.env.TARGET_LINUX:
         obj.uselib += ' GTK'
-    obj.use = 'libdcpomatic'
+    obj.use = 'libdcpomatic2'
     obj.source = sources
-    obj.target = 'dcpomatic-wx'
+    obj.target = 'dcpomatic2-wx'
 
-    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld)
+    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)
 
 def pot(bld):
-    i18n.pot(os.path.join('src', 'wx'), sources, 'libdcpomatic-wx')
+    i18n.pot(os.path.join('src', 'wx'), sources + " editable_list.h", 'libdcpomatic-wx')
 
 def pot_merge(bld):
     i18n.pot_merge(os.path.join('src', 'wx'), 'libdcpomatic-wx')