Hand-apply 62f8054d65a8bd31689fc0c977c1bb2385e71afa from master; config of encryption...

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index 07105006904bfaa27cc0474bf5b095355e68ba1c..1b701bb074bec3d1aba88536a0d9be42264c1cab 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -15,33 +15,46 @@ sources = """
           config_dialog.cc
           content_colour_conversion_dialog.cc
           content_menu.cc
+          content_panel.cc
+          content_sub_panel.cc
+          dcp_panel.cc
+          image_sequence_dialog.cc
           isdcf_metadata_dialog.cc
           dir_picker_ctrl.cc
           dolby_certificate_dialog.cc
           doremi_certificate_dialog.cc
           download_certificate_dialog.cc
           film_editor.cc
-          film_editor_panel.cc
           film_viewer.cc
           filter_dialog.cc
           filter_editor.cc
+          fonts_dialog.cc
           gain_calculator_dialog.cc
           hints_dialog.cc
           job_manager_view.cc
-          job_wrapper.cc
           kdm_dialog.cc
+          key_dialog.cc
+          make_signer_chain_dialog.cc
           new_film_dialog.cc
           preset_colour_conversion_dialog.cc
           properties_dialog.cc
           repeat_dialog.cc
+          report_problem_dialog.cc
           screen_dialog.cc
           server_dialog.cc
           servers_list_dialog.cc
           subtitle_panel.cc
+          subtitle_view.cc
           table_dialog.cc
           timecode.cc
           timeline.cc
+          timeline_content_view.cc
           timeline_dialog.cc
+          timeline_audio_content_view.cc
+          timeline_subtitle_content_view.cc
+          timeline_time_axis_view.cc
+          timeline_video_content_view.cc
+          timeline_view.cc
           timing_panel.cc
           update_dialog.cc
           video_panel.cc
@@ -82,16 +95,18 @@ def build(bld):
     else:
         obj = bld(features = 'cxx cxxshlib')
 
-    obj.name   = 'libdcpomatic-wx'
+    obj.name   = 'libdcpomatic2-wx'
     obj.export_includes = ['..']
-    obj.uselib = 'WXWIDGETS DCP'
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD WXWIDGETS DCP SUB ZIP '
     if bld.env.TARGET_LINUX:
-        obj.uselib += ' GTK'
-    obj.use = 'libdcpomatic'
+        obj.uselib += 'GTK '
+    if bld.env.TARGET_WINDOWS:
+        obj.uselib += 'WINSOCK2 '
+    obj.use = 'libdcpomatic2'
     obj.source = sources
-    obj.target = 'dcpomatic-wx'
+    obj.target = 'dcpomatic2-wx'
 
-    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic-wx', bld)
+    i18n.po_to_mo(os.path.join('src', 'wx'), 'libdcpomatic2-wx', bld)
 
 def pot(bld):
     i18n.pot(os.path.join('src', 'wx'), sources + " editable_list.h", 'libdcpomatic-wx')