Use logic operators to collapse nested conditionals in Build file

diff --git a/Build b/Build
index 421a84ea4cc75c913ec55ffd4b603fda46ab215b..4862e3d19589073928578698ab8dc4f0a504dcb6 100644 (file)
--- 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;