X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=1b701bb074bec3d1aba88536a0d9be42264c1cab;hb=a85c82137ec26124ebefccb4aeebb96a3cdb8a4c;hp=719496ae702a9d190aaea309a5d76e912ca8443a;hpb=1f82930e73679d6aec5223caa255f564339a1a2a;p=dcpomatic.git

diff --git a/src/wx/wscript b/src/wx/wscript
index 719496ae7..1b701bb07 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -17,6 +17,8 @@ sources = """
           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
@@ -26,15 +28,18 @@ sources = """
           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
@@ -43,7 +48,13 @@ sources = """
           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
@@ -66,7 +77,6 @@ def configure(conf):
                                     'wx_gtk2u_adv-3.0', 'wx_gtk2u_core-3.0', 'wx_baseu_xml-3.0', 'wx_baseu-3.0']
         conf.env.LIB_WXWIDGETS = ['tiff', 'SM', 'dl', 'jpeg', 'png', 'X11', 'expat']
         if conf.env.TARGET_DEBIAN and conf.env.DEBIAN_UNSTABLE:
-            conf.env.LIB_WXWIDGETS.append('Xxf86vm')
             conf.env.LIB_WXWIDGETS.append('Xext')
             conf.env.LIB_WXWIDGETS.append('X11')
 
@@ -85,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')