More GL build fixes.

diff --git a/src/wx/gl_video_view.cc b/src/wx/gl_video_view.cc
index e1a8523cf4350167ba9fca72aabef37e06f47074..cbd5e23cff8ba62e9fc7ac2a44c6b6c3b8a606c8 100644 (file)
--- a/src/wx/gl_video_view.cc
+++ b/src/wx/gl_video_view.cc
@@ -47,7 +47,7 @@ GLVideoView::GLVideoView (FilmViewer* viewer, wxWindow *parent)
        _canvas->Bind (wxEVT_PAINT, boost::bind(&GLVideoView::paint, this));
        _canvas->Bind (wxEVT_SIZE, boost::bind(boost::ref(Sized)));
 
-#ifdef DCPOMATIC_LINUX
+#if defined(DCPOMATIC_LINUX) && defined(DCPOMATIC_HAVE_GLX_SWAP_INTERVAL_EXT)
        if (_canvas->IsExtensionSupported("GLX_EXT_swap_control")) {
                /* Enable vsync */
                Display* dpy = wxGetX11Display();

diff --git a/src/wx/wscript b/src/wx/wscript
index f355189ef36b4ec680cf59eb591704bb828f1e77..323a19a2b4afb2c297e19fc84e60dedc87e4fa56 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -271,7 +271,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):