X-Git-Url: http://git.tdb.fi/?p=libs%2Fgui.git;a=blobdiff_plain;f=Build;h=458b1366c59f0aa7eaf9d0f107bfacc0a9a188e3;hp=0eac10a2e357cceabe9710141208212b55bf047f;hb=69aaca13ae0949acf12056e390cbd1009a8487b2;hpb=029a2e8ab09d5ba7fd17100c5ed15a7deb0934f8

diff --git a/Build b/Build
index 0eac10a..458b136 100644
--- a/Build
+++ b/Build
@@ -5,12 +5,9 @@ package "mspgui"
 
 	require "mspcore";
 	require "sigc++-2.0";
-	if_arch "!windows"
+	if_arch "!windows & !darwin & !android"
 	{
-		if_arch "!darwin"
-		{
-			require "xlib";
-		};
+		require "xlib";
 	};
 	if_arch "windows"
 	{
@@ -43,34 +40,78 @@ package "mspgui"
 		require "libpng";
 	};
 
-	feature "opengl" "Include support for OpenGL contexts"
+	feature "libjpeg" "Include libjpeg support for loading JPEG files"
 	{
 		default "yes";
 	};
-	if_feature "opengl"
+	if_feature "libjpeg"
 	{
-		require "opengl";
+		build_info
+		{
+			library "jpeg";
+		};
 	};
 
-	if_arch "!windows"
+	if_arch "darwin"
 	{
-		if_arch "!darwin"
+		feature "quartz" "Include Quartz support for loading image files"
+		{
+			default "yes";
+		};
+		if_feature "quartz"
 		{
-			feature "xrandr" "Include support for video mode switching with XRandR";
-			if_feature "xrandr"
+			build_info
 			{
-				build_info
-				{
-					library "Xrandr";
-				};
+				library "ApplicationServices.framework";
 			};
 		};
 	};
 
+	feature "opengl" "Include support for OpenGL contexts"
+	{
+		default "yes";
+	};
+	if_feature "opengl"
+	{
+		if_arch "android"
+		{
+			require "opengles";
+		};
+		if_arch "!android"
+		{
+			require "opengl";
+		};
+	};
+
+	if_arch "!windows & !darwin & !android"
+	{
+		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 "linux"
+		{
+			overlay "linux";
+		};
 		if_arch "windows"
 		{
 			overlay "windows";
@@ -81,23 +122,37 @@ package "mspgui"
 		};
 		if_arch "darwin"
 		{
+			if_feature "quartz"
+			{
+				source "source/graphics/quartz";
+			};
 			overlay "cocoa";
 			if_feature "opengl"
 			{
 				overlay "cgl";
 			};
+			build_info
+			{
+				standard CC "c99";
+			};
+		};
+		if_arch "android"
+		{
+			overlay "android";
+			if_feature "opengl"
+			{
+				overlay "egl_android";
+			};
 		};
-		if_arch "!windows"
+		if_arch "!windows & !darwin & !android"
 		{
-			if_arch "!darwin"
+			overlay "x11";
+			if_feature "opengl"
 			{
-				overlay "x11";
-				if_feature "opengl"
-				{
-					overlay "glx";
-				};
+				overlay "glx";
 			};
 		};
+		overlay "generic";
 		install true;
 		install_map
 		{
@@ -108,10 +163,7 @@ package "mspgui"
 	program "ev"
 	{
 		source "examples/ev.cpp";
-		build_info
-		{
-			library "mspgui";
-		};
+		use "mspgui";
 	};
 
 	source_tarball