X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Fwscript;h=26bf32bdcc6d002b1e6439f2404c734b7007e64c;hb=34b40f12d7eec52862999da9e4417fc8f6e0f9af;hp=884eabc3a85a0c05f2409b12ca39478398000d60;hpb=996b0c06e23bcb6b300d7b8799df94993692e07d;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index 884eabc3a..26bf32bdc 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -4,31 +4,66 @@ from waflib import Logs
 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
           dir_picker_ctrl.cc
           film_editor.cc
+          film_editor_panel.cc
           film_viewer.cc
           filter_dialog.cc
-          filter_view.cc
+          filter_editor.cc
           gain_calculator_dialog.cc
-          imagemagick_content_dialog.cc
+          hints_dialog.cc
           job_manager_view.cc
           job_wrapper.cc
+          kdm_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
+          timecode.cc
           timeline.cc
           timeline_dialog.cc
+          timing_panel.cc
+          video_panel.cc
           wx_util.cc
           wx_ui_signaller.cc
           """
 
 def configure(conf):
-    conf.check_cfg(package = '', path = conf.options.wx_config, args = '--cppflags --cxxflags --libs', uselib_store = 'WXWIDGETS', mandatory = True)
+    args = '--cppflags --cxxflags'
+    if not conf.env.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:
+	# 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_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']
+ 
+    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 != '3.0.0':
+        conf.fatal('wxwidgets version 3.0.0 is required; %s found' % wx_version)
 
 def build(bld):
     if bld.env.STATIC:
@@ -37,9 +72,10 @@ def build(bld):
         obj = bld(features = 'cxx cxxshlib')
 
     obj.name   = 'libdcpomatic-wx'
-    obj.includes = [ '..' ]
-    obj.export_includes = ['.']
+    obj.export_includes = ['..']
     obj.uselib = 'WXWIDGETS'
+    if bld.env.TARGET_LINUX:
+        obj.uselib += ' GTK'
     obj.use = 'libdcpomatic'
     obj.source = sources
     obj.target = 'dcpomatic-wx'
@@ -47,7 +83,7 @@ def build(bld):
     i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-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')