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

diff --git a/Build b/Build
index b96da4d..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,6 +40,18 @@ package "mspgui"
 		require "libpng";
 	};
 
+	feature "libjpeg" "Include libjpeg support for loading JPEG files"
+	{
+		default "yes";
+	};
+	if_feature "libjpeg"
+	{
+		build_info
+		{
+			library "jpeg";
+		};
+	};
+
 	if_arch "darwin"
 	{
 		feature "quartz" "Include Quartz support for loading image files"
@@ -64,10 +73,17 @@ package "mspgui"
 	};
 	if_feature "opengl"
 	{
-		require "opengl";
+		if_arch "android"
+		{
+			require "opengles";
+		};
+		if_arch "!android"
+		{
+			require "opengl";
+		};
 	};
 
-	if_arch "!windows & !darwin"
+	if_arch "!windows & !darwin & !android"
 	{
 		feature "xrandr" "Include support for video mode switching with XRandR";
 		if_feature "xrandr"
@@ -84,10 +100,18 @@ package "mspgui"
 		{
 			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";
@@ -107,8 +131,20 @@ package "mspgui"
 			{
 				overlay "cgl";
 			};
+			build_info
+			{
+				standard CC "c99";
+			};
 		};
-		if_arch "!windows & !darwin"
+		if_arch "android"
+		{
+			overlay "android";
+			if_feature "opengl"
+			{
+				overlay "egl_android";
+			};
+		};
+		if_arch "!windows & !darwin & !android"
 		{
 			overlay "x11";
 			if_feature "opengl"
@@ -116,6 +152,7 @@ package "mspgui"
 				overlay "glx";
 			};
 		};
+		overlay "generic";
 		install true;
 		install_map
 		{
@@ -126,10 +163,7 @@ package "mspgui"
 	program "ev"
 	{
 		source "examples/ev.cpp";
-		build_info
-		{
-			library "mspgui";
-		};
+		use "mspgui";
 	};
 
 	source_tarball