swaroop: try to make -theater and -studio variants.

[dcpomatic.git] / src / wx / wscript

diff --git a/src/wx/wscript b/src/wx/wscript
index f355189ef36b4ec680cf59eb591704bb828f1e77..5db943ab82ffe1059d27a828c03b34a0ebef0644 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -182,6 +182,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 +273,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 +293,7 @@ def build(bld):
     if bld.env.TARGET_OSX:
         obj.framework = ['CoreAudio', 'OpenGL']
     obj.use = 'libdcpomatic2'
-    if bld.env.VARIANT == 'swaroop':
+    if bld.env.VARIANT.startswith('swaroop-'):
         obj.source = sources + " swaroop_controls.cc"
     else:
         obj.source = sources