X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=91255cea1377423f7124d0ac026906282bd1621d;hb=0913ba6fdd0e28740e0b521f275b9ce82c4a1b7a;hp=0f29bb238b49fc49a13b2f595b335fcb9d0fac00;hpb=e8ebbdbe8dbaec58f9e661efa3124118705fcd13;p=libs%2Fgui.git

diff --git a/Build b/Build
index 0f29bb2..91255ce 100644
--- 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,48 @@ 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 "xrandr" "Include support for video mode switching with XRandR";
+		if_feature "xrandr"
 		{
-			library "Xxf86vm";
+			build_info
+			{
+				library "Xrandr";
+			};
 		};
 	};
 
-	headers "msp/graphics"
-	{
-		source "source/graphics";
-		install true;
-	};
-
-	headers "msp/input"
-	{
-		source "source/input";
-		install true;
-	};
-
 	library "mspgui"
 	{
 		source "source/graphics";
 		source "source/input";
+		if_arch "windows"
+		{
+			overlay "windows";
+			if_feature "opengl"
+			{
+				overlay "wgl";
+			};
+		};
+		if_arch "!windows"
+		{
+			overlay "x11";
+			if_feature "opengl"
+			{
+				overlay "glx";
+			};
+		};
 		install true;
+		install_map
+		{
+			map "source" "include/msp";
+		};
 	};
 
 	program "ev"
@@ -78,7 +89,7 @@ package "mspgui"
 		};
 	};
 
-	tarball "@src"
+	source_tarball
 	{
 		source "License.txt";
 		source "Changelog.txt";