projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
85f3453
)
Attempted Windows GL fixes.
author
Carl Hetherington
<cth@carlh.net>
Mon, 3 Jun 2019 15:36:42 +0000
(16:36 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 3 Jun 2019 15:36:42 +0000
(16:36 +0100)
src/wx/gl_video_view.cc
patch
|
blob
|
history
diff --git
a/src/wx/gl_video_view.cc
b/src/wx/gl_video_view.cc
index 52d39b571d435e8f4e2d7d89ef741649f214edc7..400e69c63169bde5bb6bbd3d246525f18583c0c2 100644
(file)
--- a/
src/wx/gl_video_view.cc
+++ b/
src/wx/gl_video_view.cc
@@
-31,12
+31,19
@@
#include <OpenGL/glext.h>
#include <OpenGL/CGLTypes.h>
#include <OpenGL/OpenGL.h>
-#else
+#endif
+
+#ifdef DCPOMATIC_LINUX
#include <GL/glu.h>
#include <GL/glext.h>
#include <GL/glxext.h>
#endif
+#ifdef DCPOMATIC_WINDOWS
+#include <GL/glu.h>
+#include <GL/glext.h>
+#endif
+
using std::cout;
using boost::shared_ptr;
using boost::optional;