X-Git-Url: http://git.tdb.fi/?p=libs%2Fcore.git;a=blobdiff_plain;f=Build;h=6ece10b05e07c70993ee64c9032015c436b9c73a;hp=8478fc5bd405f8d75f06be224f86ba0f3da9386a;hb=292aed8e23ea543b089d5f2a73000de4640befe7;hpb=f1e97209d74290a88639cd2895a7b4a86ffee52e

diff --git a/Build b/Build
index 8478fc5..6ece10b 100644
--- a/Build
+++ b/Build
@@ -1,67 +1,47 @@
 package "mspcore"
 {
-	version "1.1";
+	version "2.0";
 	description "Mikkosoft Productions core library";
 
 	require "sigc++-2.0";
-	if "arch!=win32"
+	build_info
 	{
-		build_info
-		{
-			library "pthread";
-		};
+		threads true;
 	};
-	if "arch=linux"
+	if_arch "linux"
 	{
 		build_info
 		{
 			library "dl";
 		};
 	};
-
-	feature "exception_backtrace" "Generate a backtrace when an exception is thrown.";
-
-	headers "msp/core"
+	if_arch "android"
 	{
-		source "source/core";
-		install true;
-	};
-
-	headers "msp/time"
-	{
-		source "source/time";
-		install true;
+		build_info
+		{
+			library "android";
+			library "log";
+		};
 	};
 
-	headers "msp/debug"
+	if_arch "darwin"
 	{
-		source "source/debug";
-		install true;
+		build_info
+		{
+			library "Foundation.framework";
+		};
 	};
 
-	headers "msp/strings"
+	feature "zlib" "Support compression with zlib"
 	{
-		source "source/strings";
-		install true;
+		default "yes";
 	};
-
-	headers "msp/stringcodec"
+	if_feature "zlib"
 	{
-		source "source/stringcodec";
-		install true;
+		require "zlib";
 	};
 
-	headers "msp/io"
-	{
-		source "source/io";
-		install true;
-	};
-
-	headers "msp/fs"
-	{
-		source "source/fs";
-		install true;
-	};
+	feature "exception_trace" "Support exception backtraces";
 
 	library "mspcore"
 	{
@@ -72,46 +52,68 @@ package "mspcore"
 		source "source/stringcodec";
 		source "source/io";
 		source "source/fs";
+		if_arch "windows"
+		{
+			overlay "windows";
+		};
+		if_arch "darwin"
+		{
+			overlay "osx";
+		};
+		if_arch "android"
+		{
+			overlay "android";
+			build_info
+			{
+				keep_symbol "ANativeActivity_onCreate";
+			};
+		};
+		if_arch "!windows"
+		{
+			overlay "unix";
+		};
+		overlay "generic";
 		install true;
+		install_map
+		{
+			map "source" "include/msp";
+		};
 	};
 
 	program "grep"
 	{
 		source "examples/grep.cpp";
-		build_info
-		{
-			library "mspcore";
-		};
+		use "mspcore";
 	};
 
 	program "transcode"
 	{
 		source "examples/transcode.cpp";
-		build_info
-		{
-			library "mspcore";
-		};
+		use "mspcore";
 	};
 
 	program "ls"
 	{
 		source "examples/ls.cpp";
-		build_info
-		{
-			library "mspcore";
-		};
+		use "mspcore";
 	};
 
 	program "syncdir"
 	{
 		source "examples/syncdir.cpp";
-		build_info
+		use "mspcore";
+	};
+
+	if_feature "zlib"
+	{
+		program "z"
 		{
-			library "mspcore";
+			source "examples/z.cpp";
+			use "mspcore";
 		};
 	};
 
-	tarball "@src"
+	source_tarball
 	{
 		source "License.txt";
 		source "source/stringcodec/jisx0208.table";