summaryrefslogtreecommitdiff
path: root/platform/x11/detect.py
diff options
context:
space:
mode:
authorAndreas Haas <liu.gam3@gmail.com>2016-06-09 18:54:06 +0200
committerAndreas Haas <liu.gam3@gmail.com>2016-06-09 18:54:06 +0200
commit18c941bbec51fa7e899a98eaadb883dfc4f046c0 (patch)
tree0ff6471f574be36802683d876553bc53d4ae6461 /platform/x11/detect.py
parentf8f30662d93a46eb4b1ece6d45be28760d5ad58c (diff)
x11: Implemented dpi detection
depends on XRandR. Had to dynamically load `XRRGetMonitors` as Ubuntu 12.04 doesn't have it. Also removed libudev from travis install list.
Diffstat (limited to 'platform/x11/detect.py')
-rw-r--r--platform/x11/detect.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 2561e09b9a..fc6c7cde8d 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -45,6 +45,11 @@ def can_build():
print("xinerama not found.. x11 disabled.")
return False
+ x11_error=os.system("pkg-config xrandr --modversion > /dev/null ")
+ if (x11_error):
+ print("xrandr not found.. x11 disabled.")
+ return False
+
return True # X11 enabled
@@ -132,6 +137,7 @@ def configure(env):
env.ParseConfig('pkg-config x11 --cflags --libs')
env.ParseConfig('pkg-config xinerama --cflags --libs')
env.ParseConfig('pkg-config xcursor --cflags --libs')
+ env.ParseConfig('pkg-config xrandr --cflags --libs')
if (env["openssl"]=="yes"):
env.ParseConfig('pkg-config openssl --cflags --libs')
@@ -179,7 +185,7 @@ def configure(env):
print("PulseAudio development libraries not found, disabling driver")
env.Append(CPPFLAGS=['-DX11_ENABLED','-DUNIX_ENABLED','-DGLES2_ENABLED','-DGLES_OVER_GL'])
- env.Append(LIBS=['GL', 'GLU', 'pthread', 'z'])
+ env.Append(LIBS=['GL', 'GLU', 'pthread', 'z', 'dl'])
#env.Append(CPPFLAGS=['-DMPC_FIXED_POINT'])
#host compiler is default..