Move credentials settings into certificate download dialogue (#1480).

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index 323a19a2b4afb2c297e19fc84e60dedc87e4fa56..f4fc4927e31562f8105a3ada3ac65e076e11755d 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -48,6 +48,7 @@ sources = """
           content_view.cc
           controls.cc
           closed_captions_dialog.cc
+          credentials_download_certificate_panel.cc
           dcp_panel.cc
           dcpomatic_button.cc
           email_dialog.cc
@@ -182,6 +183,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
@@ -291,7 +294,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