diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-10-21 00:55:52 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2020-01-08 21:56:47 +0100 |
| commit | 5eb8b5c3a1566aef638e9d9df03b88d320735092 (patch) | |
| tree | eb33df0144e1784efcf5d46e0dca9e19f6bff8b8 /src/tools | |
| parent | ca3393a75c1685d1615ff678b58bd3b75fe79cd2 (diff) | |
Barely-functioning GL playback with new arrangement.
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/dcpomatic.cc | 9 | ||||
| -rw-r--r-- | src/tools/dcpomatic_player.cc | 9 | ||||
| -rw-r--r-- | src/tools/wscript | 2 |
3 files changed, 18 insertions, 2 deletions
diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc index 68bf20732..47851a218 100644 --- a/src/tools/dcpomatic.cc +++ b/src/tools/dcpomatic.cc @@ -92,6 +92,9 @@ #include <wx/preferences.h> #include <wx/splash.h> #include <wx/wxhtml.h> +#ifdef __WXGTK__ +#include <X11/Xlib.h> +#endif #ifdef __WXMSW__ #include <shellapi.h> #endif @@ -1503,7 +1506,11 @@ public: : wxApp () , _frame (0) , _splash (0) - {} + { +#ifdef DCPOMATIC_LINUX + XInitThreads (); +#endif + } private: diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index f68d0ead2..6bd5b36ff 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -66,6 +66,9 @@ #include <wx/preferences.h> #include <wx/progdlg.h> #include <wx/display.h> +#ifdef __WXGTK__ +#include <X11/Xlib.h> +#endif #ifdef __WXOSX__ #include <ApplicationServices/ApplicationServices.h> #endif @@ -1044,7 +1047,11 @@ public: App () : wxApp () , _frame (0) - {} + { +#ifdef DCPOMATIC_LINUX + XInitThreads (); +#endif + } private: diff --git a/src/tools/wscript b/src/tools/wscript index 8fd23cfb3..3b2c0a04c 100644 --- a/src/tools/wscript +++ b/src/tools/wscript @@ -68,6 +68,8 @@ def build(bld): obj.uselib += ' WXWIDGETS' if not bld.env.TARGET_OSX: obj.uselib += ' GL GLU' + if bld.env.TARGET_LINUX: + obj.uselib += ' X11' obj.includes = ['..'] obj.use = ['libdcpomatic2', 'libdcpomatic2-wx'] obj.source = '%s.cc' % t |