X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=Build;h=690ff5a6ed8d5f4031c7dc21fe4f27b7be86c812;hb=27356249e3607c78f5da9823c88703a6f4f7bed1;hp=75f78840fc111611ec3b4d5e2df7ffaf909a12f8;hpb=6b650fb6fb08c058221ca08d7982ee07147fec77;p=libs%2Fgui.git

diff --git a/Build b/Build
index 75f7884..690ff5a 100644
--- a/Build
+++ b/Build
@@ -1,22 +1,21 @@
 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 "xinput";
 		};
 	};
 	if_arch "darwin"
@@ -76,18 +75,42 @@ 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"
+		{
+			export true;
+		};
 		if_feature "xrandr"
 		{
 			require "xrandr";
 		};
 	};
 
+	build_info
+	{
+		standard CXX "c++11";
+	};
+
 	library "mspgui"
 	{
 		source "source/graphics";
@@ -132,14 +155,27 @@ package "mspgui"
 				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
 		{
@@ -150,10 +186,7 @@ package "mspgui"
 	program "ev"
 	{
 		source "examples/ev.cpp";
-		build_info
-		{
-			library "mspgui";
-		};
+		use "mspgui";
 	};
 
 	source_tarball