diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-10-30 17:25:49 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-10-30 17:25:49 +0100 |
| commit | 2f64c6a86194db91be2ca873036b683f8f5b8739 (patch) | |
| tree | b550a610346859721e378fb602fbeec91c80d4da /src/drivers/X11/Fl_X11_Screen_Driver.cxx | |
| parent | ffcf8bd0b78255ad7ad3a62a5826c1fa6096cd5e (diff) | |
Concentrate source code that supports Darwin + XQuartz + fink as test platform
Diffstat (limited to 'src/drivers/X11/Fl_X11_Screen_Driver.cxx')
| -rw-r--r-- | src/drivers/X11/Fl_X11_Screen_Driver.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/drivers/X11/Fl_X11_Screen_Driver.cxx b/src/drivers/X11/Fl_X11_Screen_Driver.cxx index d13562ea9..ff095f2c4 100644 --- a/src/drivers/X11/Fl_X11_Screen_Driver.cxx +++ b/src/drivers/X11/Fl_X11_Screen_Driver.cxx @@ -21,6 +21,7 @@ #include "Fl_X11_Screen_Driver.H" #include "../Xlib/Fl_Font.H" #include "Fl_X11_Window_Driver.H" +#include "../../src/Fl_System_Driver.H" #include "../Xlib/Fl_Xlib_Graphics_Driver.H" #include <FL/Fl.H> #include <FL/platform.H> @@ -287,10 +288,7 @@ void Fl_X11_Screen_Driver::init() { static XRRSizes_type XRRSizes_f = NULL; if (!XRRSizes_f) { void *libxrandr_addr = dlopen("libXrandr.so.2", RTLD_LAZY); - if (!libxrandr_addr) libxrandr_addr = dlopen("libXrandr.so", RTLD_LAZY); -# ifdef __APPLE_CC__ // allows testing on Darwin + X11 - if (!libxrandr_addr) libxrandr_addr = dlopen("/opt/X11/lib/libXrandr.dylib", RTLD_LAZY); -# endif + if (!libxrandr_addr) libxrandr_addr = Fl::system_driver()->dlopen("libXrandr.so"); if (libxrandr_addr) XRRSizes_f = (XRRSizes_type)dlsym(libxrandr_addr, "XRRSizes"); } if (XRRSizes_f) { |