From: Mikko Rasa Date: Sun, 6 Oct 2013 08:32:00 +0000 (+0300) Subject: Use logic operators to collapse nested conditionals in Build file X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=10e81fc50978a1a695f9d5073887e2a043b99e37;p=libs%2Fgui.git Use logic operators to collapse nested conditionals in Build file --- diff --git a/Build b/Build index 421a84e..4862e3d 100644 --- a/Build +++ b/Build @@ -52,18 +52,12 @@ package "mspgui" require "opengl"; }; - if_arch "!windows" + if_arch "!windows & !darwin" { - if_arch "!darwin" + feature "xrandr" "Include support for video mode switching with XRandR"; + if_feature "xrandr" { - feature "xrandr" "Include support for video mode switching with XRandR"; - if_feature "xrandr" - { - build_info - { - library "Xrandr"; - }; - }; + require "xrandr"; }; }; @@ -95,15 +89,12 @@ package "mspgui" overlay "cgl"; }; }; - if_arch "!windows" + if_arch "!windows & !darwin" { - if_arch "!darwin" + overlay "x11"; + if_feature "opengl" { - overlay "x11"; - if_feature "opengl" - { - overlay "glx"; - }; + overlay "glx"; }; }; install true;