X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=8297f37c9f72f10ea86cc6a33f22bc32e081ff47;hb=0f42e807a707249cd1a60fa6e476cb47a4147c5a;hp=1f9aed6b3c4c79aebaf453630ce9ad36e73bb1fe;hpb=1a693725f9a8cc6ba58f65b2f1ef03255d295f23;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index 1f9aed6b3..8297f37c9 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -31,19 +31,19 @@ sources = """
           audio_mapping_view.cc
           audio_panel.cc
           audio_plot.cc
+          batch_job_view.cc
           cinema_dialog.cc
           colour_conversion_editor.cc
           config_dialog.cc
+          confirm_kdm_email_dialog.cc
           content_colour_conversion_dialog.cc
           content_menu.cc
           content_panel.cc
           content_properties_dialog.cc
           content_sub_panel.cc
           dcp_panel.cc
-          editable_list.cc
           email_dialog.cc
           image_sequence_dialog.cc
-          image_subtitle_colour_dialog.cc
           isdcf_metadata_dialog.cc
           dir_picker_ctrl.cc
           dolby_doremi_certificate_panel.cc
@@ -51,6 +51,7 @@ sources = """
           download_certificate_panel.cc
           file_picker_ctrl.cc
           film_editor.cc
+          film_name_location_dialog.cc
           film_viewer.cc
           filter_dialog.cc
           filter_editor.cc
@@ -68,12 +69,14 @@ sources = """
           key_dialog.cc
           make_chain_dialog.cc
           move_to_dialog.cc
+          nag_dialog.cc
           name_format_editor.cc
-          new_film_dialog.cc
+          normal_job_view.cc
           playhead_to_timecode_dialog.cc
           playhead_to_frame_dialog.cc
           repeat_dialog.cc
           report_problem_dialog.cc
+          rename_template_dialog.cc
           rgba_colour_picker.cc
           save_template_dialog.cc
           screen_dialog.cc
@@ -81,11 +84,12 @@ sources = """
           self_dkdm_dialog.cc
           server_dialog.cc
           servers_list_dialog.cc
+          subtitle_appearance_dialog.cc
           subtitle_panel.cc
           subtitle_view.cc
           system_font_dialog.cc
           table_dialog.cc
-          text_subtitle_appearance_dialog.cc
+          templates_dialog.cc
           time_picker.cc
           timecode.cc
           timeline.cc
@@ -151,19 +155,62 @@ def configure(conf):
     if not wx_version.startswith('3.0.'):
         conf.fatal('wxwidgets version 3.0.x is required; %s found' % wx_version)
 
+    try:
+        conf.check_cfg(msg='Checking for RtAudio using pkg-config',
+                       package='rtaudio',
+                       args='--cflags --libs',
+                       uselib_store='RTAUDIO',
+                       mandatory=True)
+    except:
+        conf.check_cfg(msg='Checking for RtAudio headers using rtaudio-config',
+                       package='',
+                       path='rtaudio-config',
+                       args='--cppflags',
+                       uselib_store='RTAUDIO',
+                       mandatory=True)
+
+        conf.check_cfg(msg='Checking for RtAudio libraries using rtaudio-config',
+                       package='',
+                       path='rtaudio-config',
+                       args='--libs',
+                       uselib_store='RTAUDIO',
+                       mandatory=True)
+
+    # 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:
+        conf.env.CFLAGS_RTAUDIO.remove('-pthread')
+        conf.env.LINKFLAGS_RTAUDIO.remove('-pthread')
+
+    conf.check_cxx(fragment="""
+                            #include <RtAudio.h>\n
+                            int main() { throw RtError("Hello"); }
+			    """,
+                   msg='Checking for RtError class',
+                   libpath='/usr/local/lib',
+                   lib=['rtaudio'],
+                   uselib_store='',
+                   define_name='DCPOMATIC_USE_RTERROR',
+                   mandatory=False)
+
+
+
 def build(bld):
     if bld.env.STATIC_DCPOMATIC:
-        obj = bld(features = 'cxx cxxstlib')
+        obj = bld(features='cxx cxxstlib')
     else:
-        obj = bld(features = 'cxx cxxshlib')
+        obj = bld(features='cxx cxxshlib')
 
     obj.name   = 'libdcpomatic2-wx'
     obj.export_includes = ['..']
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP '
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO '
     if bld.env.TARGET_LINUX:
         obj.uselib += 'GTK '
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += 'WINSOCK2 '
+        obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER '
+    if bld.env.TARGET_OSX:
+        obj.framework = ['CoreAudio']
     obj.use = 'libdcpomatic2'
     obj.source = sources
     obj.target = 'dcpomatic2-wx'