X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fwscript;h=f78a8c61762ba71fda5a59ebf19c63b2b42ad698;hp=f355189ef36b4ec680cf59eb591704bb828f1e77;hb=8f12e84009d7c2685bb2eeb32665876463d4e6e5;hpb=12096b85415ae72468f2f0591366b8cf3668a604

diff --git a/src/wx/wscript b/src/wx/wscript
index f355189ef..f78a8c617 100644
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -48,8 +48,11 @@ sources = """
           content_view.cc
           controls.cc
           closed_captions_dialog.cc
+          credentials_download_certificate_panel.cc
           dcp_panel.cc
           dcpomatic_button.cc
+          disk_warning_dialog.cc
+          drive_wipe_warning_dialog.cc
           email_dialog.cc
           image_sequence_dialog.cc
           isdcf_metadata_dialog.cc
@@ -99,8 +102,11 @@ sources = """
           password_entry.cc
           player_config_dialog.cc
           player_information.cc
+          player_stress_tester.cc
           playhead_to_timecode_dialog.cc
           playhead_to_frame_dialog.cc
+          playlist_controls.cc
+          playlist_editor_config_dialog.cc
           question_dialog.cc
           rating_dialog.cc
           qube_certificate_panel.cc
@@ -120,6 +126,7 @@ sources = """
           standard_controls.cc
           static_text.cc
           subtitle_appearance_dialog.cc
+          suspender.cc
           system_font_dialog.cc
           system_information_dialog.cc
           table_dialog.cc
@@ -141,9 +148,11 @@ sources = """
           timeline_video_content_view.cc
           timeline_view.cc
           timing_panel.cc
+          try_unmount_dialog.cc
           update_dialog.cc
           verify_dcp_dialog.cc
           video_panel.cc
+          video_view.cc
           video_waveform_dialog.cc
           video_waveform_plot.cc
           wx_util.cc
@@ -182,6 +191,8 @@ def configure(conf):
 
     if conf.env.TARGET_LINUX:
         conf.env.append_value('CXXFLAGS', ['-DGLX_GLXEXT_PROTOTYPES'])
+    if conf.env.TARGET_WINDOWS:
+        conf.env.append_value('CXXFLAGS', ['-DWGL_WGLEXT_PROTOTYPES'])
 
     if conf.options.static_wxwidgets:
 	# wx-config returns its static libraries as full paths, without -l prefixes, which confuses
@@ -271,7 +282,8 @@ def configure(conf):
                        msg='Checking for glXSwapIntervalEXT',
                        okmsg='yes',
                        uselib='GL WXWIDGETS',
-                       define_name='DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT')
+                       define_name='DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT',
+                       mandatory=False)
 
 
 def build(bld):
@@ -290,7 +302,7 @@ def build(bld):
     if bld.env.TARGET_OSX:
         obj.framework = ['CoreAudio', 'OpenGL']
     obj.use = 'libdcpomatic2'
-    if bld.env.VARIANT == 'swaroop':
+    if not len(bld.env.VARIANT) == 0 and bld.env.VARIANT.startswith('swaroop-'):
         obj.source = sources + " swaroop_controls.cc"
     else:
         obj.source = sources