More OS X GL fixes.

diff --git a/src/wx/gl_view.cc b/src/wx/gl_view.cc
index 1b2b5f2cc7cadae3c3567978d2c3d90bce004a5c..2ed14276bc8453995a7b0644e32e745b5b404f94 100644 (file)
--- a/src/wx/gl_view.cc
+++ b/src/wx/gl_view.cc
@@ -24,8 +24,13 @@
 #include <boost/bind.hpp>
 #include <iostream>
 
+#ifdef DCPOMATIC_OSX
+#include <OpenGL/glu.h>
+#include <OpenGL/glext.h>
+#else
 #include <GL/glu.h>
 #include <GL/glext.h>
+#endif
 
 using std::cout;
 using boost::shared_ptr;

diff --git a/src/wx/wscript b/src/wx/wscript
index 4121bfff12e36ee6271e967020e1f7589ea066ec..d0aa35a54ced1cebe96a7f8c1fa655a3e2d7276e 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -261,11 +261,11 @@ def build(bld):
 
     obj.name   = 'libdcpomatic2-wx'
     obj.export_includes = ['..']
-    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO GL GLU '
+    obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD BOOST_REGEX WXWIDGETS DCP SUB ZIP CXML RTAUDIO '
     if bld.env.TARGET_LINUX:
-        obj.uselib += 'GTK '
+        obj.uselib += 'GTK GL GLU '
     if bld.env.TARGET_WINDOWS:
-        obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER '
+        obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER GL GLU '
     if bld.env.TARGET_OSX:
         obj.framework = ['CoreAudio', 'OpenGL']
     obj.use = 'libdcpomatic2'