Hide passwords in text fields.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index cdd7e691cd8d04307f7b8bf0d18d3a6400b48031..aad7ecc6339bfc9e9ebbd23ca1baa18e8a46c266 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -67,11 +67,11 @@ sources = """
           filter_editor.cc
           focus_manager.cc
           fonts_dialog.cc
-          font_files_dialog.cc
           full_config_dialog.cc
           gain_calculator_dialog.cc
           gdc_certificate_panel.cc
           hints_dialog.cc
+          html_dialog.cc
           initial_setup_dialog.cc
           instant_i18n_dialog.cc
           i18n_hook.cc
@@ -85,6 +85,7 @@ sources = """
           kdm_timing_panel.cc
           key_dialog.cc
           make_chain_dialog.cc
+          markers_dialog.cc
           message_dialog.cc
           monitor_dialog.cc
           move_to_dialog.cc
@@ -93,6 +94,7 @@ sources = """
           new_dkdm_folder_dialog.cc
           normal_job_view.cc
           paste_dialog.cc
+          password_entry.cc
           player_config_dialog.cc
           player_information.cc
           playhead_to_timecode_dialog.cc
@@ -142,12 +144,15 @@ sources = """
           """
 
 def configure(conf):
+
+    wx_libs = 'core,richtext,adv,html,xml'
+
     try:
         wx_config = '/usr/lib64/wx/config/gtk2-unicode-3.0'
         conf.check_cfg(msg='Checking for wxWidgets using gtk2-unicode-3.0',
                        package='',
                        path=wx_config,
-                       args='--cppflags --cxxflags --libs std,richtext',
+                       args='--cppflags --cxxflags --libs %s' % wx_libs,
                        uselib_store='WXWIDGETS',
                        mandatory=True)
     except:
@@ -156,7 +161,7 @@ def configure(conf):
             conf.check_cfg(msg='Checking for wxWidgets using wx-config-3.0-gtk2',
                            package='',
                            path=wx_config,
-                           args='--cppflags --cxxflags --libs std,richtext',
+                           args='--cppflags --cxxflags --libs %s' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)
         except:
@@ -164,7 +169,7 @@ def configure(conf):
             conf.check_cfg(msg='Checking for wxWidgets using wx-config',
                            package='',
                            path=wx_config,
-                           args='--cppflags --cxxflags --libs std,richtext',
+                           args='--cppflags --cxxflags --libs %s' % wx_libs,
                            uselib_store='WXWIDGETS',
                            mandatory=True)
 
@@ -216,10 +221,14 @@ def configure(conf):
 
     # Some rtaudio-configs don't include rtaudio as a link library.  Go figure.
     conf.env.LIB_RTAUDIO.append('rtaudio')
-    # Don't explicitly link with pthread on Windows
     if conf.env.TARGET_WINDOWS:
+        # Don't explicitly link with pthread on Windows
         conf.env.CFLAGS_RTAUDIO.remove('-pthread')
         conf.env.LINKFLAGS_RTAUDIO.remove('-pthread')
+        # We need some libraries for WASAPI
+        conf.env.LIB_RTAUDIO.append('mfplat')
+        conf.env.LIB_RTAUDIO.append('mfuuid')
+        conf.env.LIB_RTAUDIO.append('wmcodecdspuuid')
 
     conf.check_cxx(fragment="""
                             #include <RtAudio.h>\n