First hacks on OOBE help.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index a2fbe0c4ea5752392f9123b3d3d899d5559289d3..ad1c49806e490847da539323e1fe57767774a9e2 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -40,6 +40,7 @@ sources = """
           config_dialog.cc
           config_move_dialog.cc
           confirm_kdm_email_dialog.cc
+          content_advanced_dialog.cc
           content_colour_conversion_dialog.cc
           content_menu.cc
           content_panel.cc
@@ -90,7 +91,6 @@ sources = """
           kdm_dialog.cc
           kdm_output_panel.cc
           kdm_timing_panel.cc
-          key_dialog.cc
           make_chain_dialog.cc
           markers_dialog.cc
           message_dialog.cc
@@ -111,8 +111,8 @@ sources = """
           playlist_controls.cc
           playlist_editor_config_dialog.cc
           question_dialog.cc
-          rating_dialog.cc
           qube_certificate_panel.cc
+          rating_dialog.cc
           recipients_panel.cc
           recipient_dialog.cc
           recreate_chain_dialog.cc
@@ -160,8 +160,9 @@ sources = """
           video_view.cc
           video_waveform_dialog.cc
           video_waveform_plot.cc
-          wx_util.cc
+          wx_help.cc
           wx_signal_manager.cc
+          wx_util.cc
           """
 
 def configure(conf):
@@ -200,7 +201,7 @@ def configure(conf):
         conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES'])
 
     if conf.options.static_wxwidgets:
-       # wx-config returns its static libraries as full paths, without -l prefixes, which confuses
+        # wx-config returns its static libraries as full paths, without -l prefixes, which confuses
         # check_cfg().  It puts the static libraries into LINKFLAGS_WXWIDGETS, so fish them out.
         stlibs = []
         new_linkflags = []
@@ -224,6 +225,10 @@ def configure(conf):
     if not wx_version.startswith('3.0.'):
         conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
 
+    config = conf.check_cfg(package='wxwidgets', path=wx_config, args='--selected-config').strip()
+    if config.find('gtk2') != -1:
+        conf.check_cfg(package='gtk+-2.0', args='--cflags --libs', uselib_store='GTK', mandatory=True)
+
     try:
         conf.check_cfg(msg='Checking for RtAudio using pkg-config',
                        package='rtaudio',