]> git.tdb.fi Git - libs/gui.git/commitdiff
Update the Build file with new Builder features
authorMikko Rasa <tdb@tdb.fi>
Wed, 12 Sep 2012 08:23:47 +0000 (11:23 +0300)
committerMikko Rasa <tdb@tdb.fi>
Wed, 12 Sep 2012 08:23:47 +0000 (11:23 +0300)
Build

diff --git a/Build b/Build
index 0f29bb238b49fc49a13b2f595b335fcb9d0fac00..f311834e48cf4ad3fde968825350396008fb06c2 100644 (file)
--- a/Build
+++ b/Build
@@ -5,11 +5,11 @@ package "mspgui"
 
        require "mspcore";
        require "sigc++-2.0";
-       if "arch!=win32"
+       if_arch "!windows"
        {
                require "xlib";
        };
-       if "arch=win32"
+       if_arch "windows"
        {
                build_info
                {
@@ -18,16 +18,16 @@ package "mspgui"
        };
 
        feature "devil" "Include DevIL support for loading image files";
-       if "with_devil"
+       if_feature "devil"
        {
-               require "devil";
+               require "IL";
        };
 
        feature "libpng" "Include libpng support for loading PNG files"
        {
                default "yes";
        };
-       if "with_libpng"
+       if_feature "libpng"
        {
                require "libpng";
        };
@@ -36,37 +36,32 @@ package "mspgui"
        {
                default "yes";
        };
-       if "with_opengl"
+       if_feature "opengl"
        {
                require "opengl";
        };
 
-       feature "xf86vidmode" "Include support for video mode switching with xf86vidmode (not win32)";
-       if "with_xf86vidmode and arch!=win32"
+       if_arch "!windows"
        {
-               build_info
+               feature "xf86vidmode" "Include support for video mode switching with xf86vidmode";
+               if_feature "xf86vidmode"
                {
-                       library "Xxf86vm";
+                       build_info
+                       {
+                               library "Xxf86vm";
+                       };
                };
        };
 
-       headers "msp/graphics"
-       {
-               source "source/graphics";
-               install true;
-       };
-
-       headers "msp/input"
-       {
-               source "source/input";
-               install true;
-       };
-
        library "mspgui"
        {
                source "source/graphics";
                source "source/input";
                install true;
+               install_map
+               {
+                       map "source" "include/msp";
+               };
        };
 
        program "ev"
@@ -78,7 +73,7 @@ package "mspgui"
                };
        };
 
-       tarball "@src"
+       source_tarball
        {
                source "License.txt";
                source "Changelog.txt";