diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-03 20:44:16 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-06 21:31:09 +0100 |
| commit | 24fc6b664f9b9252759408a0864507ca76d46a58 (patch) | |
| tree | 7471d5da1e18a7495a2067ba81ebe07784dac249 | |
| parent | 415d1673d59d459c1552f4fb10f591ff70a1b3bd (diff) | |
More OS X GL fixes.
| -rw-r--r-- | src/wx/gl_view.cc | 5 | ||||
| -rw-r--r-- | src/wx/wscript | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/src/wx/gl_view.cc b/src/wx/gl_view.cc index 1b2b5f2cc..2ed14276b 100644 --- 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 4121bfff1..d0aa35a54 100644 --- 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' |