X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=Build;h=d9d7fc73ac6c795094bcc672a74999b253d2d20c;hb=HEAD;hp=b96da4d66d3388b53b0c062a25fff18b33af1e1b;hpb=925757a29754bac7980b905b830d851811c50ba6;p=libs%2Fgui.git

diff --git a/Build b/Build
index b96da4d..2edee77 100644
--- a/Build
+++ b/Build
@@ -1,22 +1,22 @@
 package "mspgui"
 {
-	version "1.1";
+	version "2.0";
 	description "Base graphics and input library";
 
 	require "mspcore";
+	require "mspdatafile";
 	require "sigc++-2.0";
-	if_arch "!windows"
+	if_arch "!windows & !darwin & !android"
 	{
-		if_arch "!darwin"
-		{
-			require "xlib";
-		};
+		require "xlib";
 	};
 	if_arch "windows"
 	{
 		build_info
 		{
 			library "gdi32";
+			library "user32";
+			library "xinput";
 		};
 	};
 	if_arch "darwin"
@@ -43,6 +43,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,18 +76,43 @@ package "mspgui"
 	};
 	if_feature "opengl"
 	{
-		require "opengl";
+		if_arch "android"
+		{
+			require "opengles";
+		};
+		if_arch "!android"
+		{
+			require "opengl";
+		};
 	};
 
-	if_arch "!windows & !darwin"
+	feature "vulkan" "Include support for Vulkan contexts"
 	{
-		feature "xrandr" "Include support for video mode switching with XRandR";
+		default "no";
+	};
+	if_feature "vulkan"
+	{
+		require "vulkan";
+	};
+
+	if_arch "!windows & !darwin & !android"
+	{
+		feature "xrandr" "Include support for video mode switching with XRandR"
+		{
+			default "yes";
+			export true;
+		};
 		if_feature "xrandr"
 		{
 			require "xrandr";
 		};
 	};
 
+	build_info
+	{
+		standard CXX "c++11";
+	};
+
 	library "mspgui"
 	{
 		source "source/graphics";
@@ -84,10 +121,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,15 +152,32 @@ 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"
 			{
 				overlay "glx";
 			};
+			if_feature "vulkan"
+			{
+				overlay "vkxlib";
+			};
 		};
+		overlay "generic";
 		install true;
 		install_map
 		{
@@ -126,10 +188,13 @@ package "mspgui"
 	program "ev"
 	{
 		source "examples/ev.cpp";
-		build_info
-		{
-			library "mspgui";
-		};
+		use "mspgui";
+	};
+
+	program "lsmodes"
+	{
+		source "examples/lsmodes.cpp";
+		use "mspgui";
 	};
 
 	source_tarball