X-Git-Url: http://git.tdb.fi/?p=libs%2Fgui.git;a=blobdiff_plain;f=Build;h=7972020fb1fd0471b8ea771eeaa6c566cef3025f;hp=591c30d58bfa8cc88fb7bd90e42458e01a104d2f;hb=5d8a8dbe07aaf8d9bd2c4c2982b34a877aee432f;hpb=683370ff99fb5d645ca4ef434ec4f3be1984364c

diff --git a/Build b/Build
index 591c30d..7972020 100644
--- a/Build
+++ b/Build
@@ -1,72 +1,156 @@
-/* $Id$ */
-
-package "mspgbase"
+package "mspgui"
 {
-	version "1.0";
+	version "1.1";
 	description "Base graphics and input library";
 
-	tar_file "License.txt";
-	tar_file "Changelog.txt";
-
 	require "mspcore";
-	require "mspstrings";
 	require "sigc++-2.0";
-	if "arch!=win32"
+	if_arch "!windows"
 	{
-		require "xlib";
+		if_arch "!darwin"
+		{
+			require "xlib";
+		};
 	};
-	if "arch=win32"
+	if_arch "windows"
 	{
 		build_info
 		{
 			library "gdi32";
 		};
 	};
+	if_arch "darwin"
+	{
+		build_info
+		{
+			library "CoreFoundation.framework";
+			library "AppKit.framework";
+		};
+	};
 
 	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 (also requires libmspio)";
-	if "with_png"
+	feature "libpng" "Include libpng support for loading PNG files"
+	{
+		default "yes";
+	};
+	if_feature "libpng"
 	{
 		require "libpng";
-		require "mspio";
 	};
 
-	feature "opengl" "Include support for OpenGL contexts";
-	if "with_opengl"
+	feature "libjpeg" "Include libjpeg support for loading JPEG files"
 	{
-		require "opengl";
+		default "yes";
 	};
-
-	feature "xf86vidmode" "Include support for video mode switching with xf86vidmode (not win32)";
-	if "with_xf86vidmode and arch!=win32"
+	if_feature "libjpeg"
 	{
 		build_info
 		{
-			library "Xxf86vm";
+			library "jpeg";
 		};
 	};
 
-	headers "gbase"
+	if_arch "darwin"
 	{
-		source "source/gbase";
-		install_headers "msp/gbase";
+		feature "quartz" "Include Quartz support for loading image files"
+		{
+			default "yes";
+		};
+		if_feature "quartz"
+		{
+			build_info
+			{
+				library "ApplicationServices.framework";
+			};
+		};
 	};
 
-	headers "input"
+	feature "opengl" "Include support for OpenGL contexts"
 	{
-		source "source/input";
-		install_headers "msp/input";
+		default "yes";
+	};
+	if_feature "opengl"
+	{
+		require "opengl";
 	};
 
-	library "mspgbase"
+	if_arch "!windows & !darwin"
 	{
-		source "source/gbase";
+		feature "xrandr" "Include support for video mode switching with XRandR";
+		if_feature "xrandr"
+		{
+			require "xrandr";
+		};
+	};
+
+	library "mspgui"
+	{
+		source "source/graphics";
 		source "source/input";
+		if_feature "libpng"
+		{
+			source "source/graphics/png";
+		};
+		if_feature "libjpeg"
+		{
+			source "source/graphics/jpeg";
+		};
+		if_feature "devil"
+		{
+			source "source/graphics/devil";
+		};
+		if_arch "windows"
+		{
+			overlay "windows";
+			if_feature "opengl"
+			{
+				overlay "wgl";
+			};
+		};
+		if_arch "darwin"
+		{
+			if_feature "quartz"
+			{
+				source "source/graphics/quartz";
+			};
+			overlay "cocoa";
+			if_feature "opengl"
+			{
+				overlay "cgl";
+			};
+		};
+		if_arch "!windows & !darwin"
+		{
+			overlay "x11";
+			if_feature "opengl"
+			{
+				overlay "glx";
+			};
+		};
 		install true;
+		install_map
+		{
+			map "source" "include/msp";
+		};
+	};
+
+	program "ev"
+	{
+		source "examples/ev.cpp";
+		build_info
+		{
+			library "mspgui";
+		};
+	};
+
+	source_tarball
+	{
+		source "License.txt";
+		source "Changelog.txt";
 	};
 };