Make terminate_threads() less likely to leave _threads containing invalid pointers.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index 66d78a2f65743ed934d7b3869da0eb0ba5ee54a1..538e7da0e6c374c7aee5d75744b6b7bfc1169d6f 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
@@ -113,7 +113,6 @@ sources = """
           standard_controls.cc
           static_text.cc
           subtitle_appearance_dialog.cc
-          swaroop_controls.cc
           system_font_dialog.cc
           table_dialog.cc
           templates_dialog.cc
@@ -143,12 +142,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:
@@ -157,7 +159,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:
@@ -165,7 +167,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)
 
@@ -217,10 +219,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
@@ -250,7 +256,10 @@ def build(bld):
     if bld.env.TARGET_OSX:
         obj.framework = ['CoreAudio']
     obj.use = 'libdcpomatic2'
-    obj.source = sources
+    if bld.env.VARIANT == 'swaroop':
+        obj.source = sources + " swaroop_controls.cc"
+    else:
+        obj.source = sources
     obj.target = 'dcpomatic2-wx'
 
     i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)